Merge branch 'master' into fixes/api

Conflicts:
	spec/requests/api/projects_spec.rb