Cancan: added the ability to add user roles and set his rights.
Readme updated
Update database.yml
Unicorn+Capistrano setup
Merge remote-tracking branch 'remotes/origin/master' into feature/settings

Conflicts:
	app/models/user.rb