Began adding My Gas Consumption functionality.
Temporarily disabled button handlers for profile until the 500 errors
are resolved.
Merge branch 'master' of https://github.com/tenoritaiga/SmartCity2

Conflicts:
	res/layout/activity_main.xml
Merge branch 'master' of https://github.com/tenoritaiga/SmartCity2

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	res/values/strings.xml