icon stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	HouseMateService/HouseMateService.v11.suo
	PhoneGap.zip
	PhoneGap/www/config.xml