hp
Merge branch 'hbs' of https://github.com/VizioArt/dock into hbs

Conflicts:
	www/js/views/home.js