remove require_tree from application.coffee.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/application.js.coffee
Merge remote-tracking branch 'origin/master'