hotspots
Merge branch 'master' of https://github.com/jansmaar/vivorbi

Conflicts:
	app/views/layouts/application.html.erb