F**king main.js
Merge branch 'master' of github.com:k-team/g-home

Conflicts:
	webclient/public/js/main.js