AC: change that show how to use new access rights
Merge branch 'master' of github.com:emclab/projectx

Conflicts:
	app/controllers/projectx/application_controller.rb