JC: All rspec passes for model and controller (not including project and contract).
Merge branch 'master' of github.com:emclab/projectx
Conflicts:
	app/helpers/projectx/tasks_helper.rb
	spec/factories/projectx_projects.rb