update
update
Merge branch 'master' of https://github.com/franklen/boxgohome

Conflicts:
	Classes/Utils.cpp