AC: try to merge
Merge branch 'master' of github.com:emclab/projectx

Conflicts:
	app/controllers/projectx/contracts_controller.rb
	app/views/projectx/projects/_form.html.erb
	app/views/projectx/projects/_form_new.html.erb