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

Conflicts:
	proj.win32/BoxGoHome.vcxproj.filters