Initial stage
conflict fixed
added bootstrap 3 and began work on facebook authentication
Omniauth fields added to User
almost working facebook authentication
Facebook authentication is now working
User interface redesign with bootstrap
Upgraded to rails 4.0.4 and rewrelic integration was added
Roles and basic authorization logic were added
Added some source code documentation
UUID introduced to all models
UUID-s removed from models
deleted obsolete controllers
Finally, angular.js is tamed and is willing to cooperate
forgot to add quite a bunch of files
minor view updates
A few menu items were renamed
finally, angular links are working again
ssh key test
Registration form is working now
Capistrano is installed but not set upw
Login function now works correctly