fixed assets, edit finished
Merge branch 'origin/feature-cockpit'

Conflicts:
	app/controllers/cockpit/CockpitController.scala
	conf/routes