# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/pages/projects/edit/index.js
#	app/assets/javascripts/projects/project_new.js

[ci skip]