Adapt the javascript code to use require.js
Merge commit 'Adapt the javascript code to use require.js'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/uploadbox.coffee