cancan + changed devise routes
git merge cancan gem - Merge branch 'development' into cancan_gem

Conflicts:
	app/assets/stylesheets/main.css