Merge branch 'master' into fixes/api

Conflicts:
	lib/api/projects.rb

diff --cc app/models/project.rb
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc lib/api/projects.rb
Simple merge

diff --cc spec/models/project_spec.rb
Simple merge