AC: checkin after pulling
AC: Merge branch 'master' of github.com:emclab/projectx

Conflicts:
	app/helpers/projectx/projects_helper.rb
	spec/dummy/db/development.sqlite3
	spec/dummy/db/schema.rb
	spec/dummy/db/test.sqlite3