something
Merge branch 'dev' of https://github.com/VizioArt/dock into dev

Conflicts:
	www/js/templates/newsArticle.html