update dashboard
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/storage/app.scala.html