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

Conflicts:
	profile/UI/icon.psd
	profile/UI/icon/icon.png
	profile/UI/icon2.psd