Remove now useless `uploads_path` setting
Precompile custom js assets and include them separately
Merge branch 'master' into add-docs-to-projects

Conflicts:
	app/assets/javascripts/application.js