fix annotation column "registration"  in "conference"
update settings deploy
update settings deploy for rails_admin
Merge branch 'master' of https://github.com/7bits/omsk-it
fix typo
fix rules page
Fixed maven-deploy-plugin's settings. Deleted user.rb file
Deleted user.rb
change deploy settings
Resolved conflict into pom.xml
Design folder has been added
Fixed prodaction deploy settings
Fixed capistrano-deploy and image's dissapearing
Merge branch 'master' of github.com:7bits/omsk-it
Added production profile.
Deleted unexising migration
Added migrate command for capistrano-deploy
Login form design has been added
Merged with master. Fixed properties location