requireJs for production with play framework is such a pain to configure so rolling back to vanilla js dep mgmt
added dsk + Jean-Pierre Kucheida
typo
Merge branch 'master' into dev

Conflicts:
	app/assets/javascripts/charts.js
	app/assets/javascripts/main.js
	app/views/index.scala.html
	app/views/main.scala.html