Resource roles
Permission checking
Resource Demands
Add demands routes
Merge branch 'master' into reznak/resource-demand

Conflicts:
	Gemfile
	app/models/user.rb
	config/routes.rb
	db/schema.rb
	spec/factories/user.rb
Deleted migration