JC: fixed rspec. All passes.
Merge branch 'master' of github.com:emclab/projectx
Conflicts:
	app/models/projectx/project.rb