diff --git a/Gemfile b/Gemfile
index d20880d7f..4d039cd92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,10 +8,11 @@ end if Bundler::VERSION < '2'
 source 'https://rubygems.org'
 
 # core
-gem 'rails',        '4.2.7.1' # when update, all initializers eis_custom files needs check/update
-gem 'iso8601',      '0.8.6' # for dates and times
-gem 'hashie-forbidden_attributes', '0.1.1'
+
 gem 'SyslogLogger', '2.0', require: 'syslog/logger'
+gem 'hashie-forbidden_attributes', '0.1.1'
+gem 'iso8601',      '0.8.6' # for dates and times
+gem 'rails',        '4.2.7.1' # when update, all initializers eis_custom files needs check/update
 gem 'rest-client'
 
 # load env
@@ -34,45 +35,46 @@ gem 'haml-rails', '0.9.0' # haml for views
 gem 'nokogiri', '1.7.1' # For XML parsing
 
 # style
-gem 'sass-rails',     '5.0.6'   # sass style
 gem 'bootstrap-sass', '3.3.5.1' # bootstrap style
+gem 'sass-rails',     '5.0.6'   # sass style
 
 # js
-gem 'uglifier',        '2.7.2'  # minifies js
+
 gem 'coffee-rails',    '4.1.0'  # coffeescript support
-gem 'turbolinks',      '2.5.3'  # faster page load
+gem 'uglifier',        '2.7.2'  # minifies js
 gem 'jquery-rails',    '4.0.4'  # jquery
+gem 'turbolinks',      '2.5.3'  # faster page load
 gem 'selectize-rails', '0.12.1' # include selectize.js for select
-gem 'therubyracer',    '0.12.2', platforms: :ruby
 gem 'jquery-validation-rails', '1.13.1' # validate on client side
+gem 'therubyracer',    '0.12.2', platforms: :ruby
 
 # view helpers
 gem 'kaminari',         '0.16.3'  # pagination
-gem 'nprogress-rails',  '0.1.6.7' # visual loader
-gem 'html5_validators', '1.2.2'   # model requements now automatically on html form
 gem 'coderay',          '1.1.0'   # xml console visualize
+gem 'html5_validators', '1.2.2'   # model requements now automatically on html form
+gem 'nprogress-rails',  '0.1.6.7' # visual loader
 gem 'select2-rails',    '3.5.9.3' # for autocomplete
 gem 'bootstrap-datepicker-rails', '1.3.1.1' # datepicker
 gem 'liquid',           '3.0.6'   # for email templates
 
 # rights
-gem 'devise',    '3.5.4'  # authenitcation
 gem 'cancancan', '1.11.0' # autharization
+gem 'devise',    '3.5.4'  # authenitcation
 
 # rest api
 gem 'grape',    '0.12.0'
 gem 'jbuilder', '2.2.16'  # json api
 
 # registry specfic
-gem 'simpleidn', '0.0.7' # For punycode
 gem 'isikukood' # for EE-id validation
+gem 'simpleidn', '0.0.7' # For punycode
 gem 'money-rails'
 
 # deploy
-gem 'whenever', '0.9.4', require: false
 gem 'data_migrate',
   github: 'internetee/data-migrate',
   ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81'
+gem 'whenever', '0.9.4', require: false
 
 # country listing
 gem 'countries', :require => 'countries/global'
@@ -81,7 +83,7 @@ gem 'countries', :require => 'countries/global'
 gem 'deep_cloneable', '2.1.1'
 
 # id + mid login
-#gem 'digidoc_client', '0.3.0'
+# gem 'digidoc_client', '0.3.0'
 gem 'digidoc_client',
     github: 'tarmotalu/digidoc_client',
     branch: 'master'
@@ -93,8 +95,8 @@ gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem)
 
 # que
 gem 'que',           '0.10.0'
-gem 'que-web',       '0.4.0'
 gem 'daemons-rails', '1.2.1'
+gem 'que-web',       '0.4.0'
 gem 'que_mailer',
     github: 'prehnRA/que-mailer',
     branch: 'master'
@@ -112,13 +114,13 @@ gem 'jquery-ui-rails', '5.0.5'
 
 
 group :development do
+  gem 'guard',                 '2.12.9' # run tests automatically
   gem 'spring',                '1.3.6'
   gem 'spring-commands-rspec', '1.0.4'
-  gem 'guard',                 '2.12.9' # run tests automatically
-  gem 'guard-rspec',           '4.5.2'
   gem 'guard-rails',           '0.7.1' # run EPP server automatically
-  gem 'rubocop',               '0.48.1'
+  gem 'guard-rspec',           '4.5.2'
   gem 'guard-rubocop',         '1.2.0'
+  gem 'rubocop',               '0.48.1'
 
   # deploy
   gem 'mina', '0.3.1' # for fast deployment
@@ -126,12 +128,12 @@ end
 
 group :development, :test do
   # test stack
-  gem 'rspec-rails',        '3.5.2'
   gem 'capybara',           '2.4.4'
-  gem 'phantomjs-binaries', '1.9.2.4'
-  gem 'poltergeist',        '1.6.0'  # We are using PhantomJS instead
-  gem 'phantomjs',          '1.9.8.0'
+  gem 'rspec-rails',        '3.5.2' 
   gem 'fabrication',        '2.13.2' # Replacement for fixtures
+  gem 'phantomjs-binaries', '1.9.2.4' 
+  gem 'phantomjs',          '1.9.8.0'
+  gem 'poltergeist',        '1.6.0'  # We are using PhantomJS instead
   gem 'launchy',            '2.4.3' # for opening browser automatically
 
   # debug