AC: updating for rspec
Merge branch 'master' of github.com:emclab/projectx

Conflicts:
	spec/factories/projectx_projects.rb