feature grant access
Merge branch 'master' of github.com:Renesau/dinosir

Conflicts:
	app/actions.rb
feature authorization
feature authorization
feature authorization
fix project table
fix project table
Merge branch 'master' of github.com:Renesau/dinosir

Conflicts:
	app/actions.rb
Merge branch 'master' of github.com:Renesau/dinosir into bootstrapswag