code reformatting
Merge branch 'master' of https://github.com/genielabs/HomeGenie-Android

Conflicts:
	HomeGenieAndroid/HomeGenie/src/com/glabs/homegenie/adapters/GenericWidgetAdapter.java