Minor mdifs
Merge branch 'webserver' of github.com:k-team/g-home into webserver

Conflicts:
	webclient/public/js/main.js
Merge branch 'webserver' of github.com:k-team/g-home into webserver

Conflicts:
	webclient/public/js/main.js