Merge remote-tracking branch 'florianz/testing' into mine

Conflicts:
	assets/javascripts/application.coffee
	dashboards/main.erb
Merge branch 'mine' of https://github.com/Dianoga/hadashboard into mine

Conflicts:
	assets/javascripts/application.coffee