admin can add a project
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/controllers/refinery/pages_controller.rb