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

Conflicts:
	proj.android/ant.properties
update iOS
add icon
update
Merge branch 'master' of https://github.com/franklen/boxgohome