temporary adding github project to repository
Merge branch 'master' of https://github.com/myhealth/MyEnergy

Conflicts:
	.gitmodules
	.gradle/1.6/taskArtifacts/fileHashes.bin
	.gradle/1.6/taskArtifacts/fileSnapshots.bin
	.gradle/1.6/taskArtifacts/outputFileStates.bin
	.gradle/1.6/taskArtifacts/taskArtifacts.bin
	.idea/gradle.xml
	.idea/modules.xml
	.idea/workspace.xml
	MyEnergy/MyEnergy.iml
	MyEnergy/build/incremental/mergeAssets/debug/merger.xml
	MyEnergy/build/incremental/mergeResources/debug/inputs.data
	MyEnergy/build/incremental/mergeResources/debug/merger.xml
	MyEnergy/build/incremental/mergeResources/debug/outputs.data
	MyEnergy/build/libs/MyEnergy-debug.ap_
	MyEnergy/build/res/all/debug/drawable-hdpi/ic_launcher.png
	MyEnergy/build/res/all/debug/drawable-mdpi/ic_launcher.png
	MyEnergy/build/res/all/debug/drawable-xhdpi/ic_launcher.png
	MyEnergy/build/res/all/debug/drawable-xxhdpi/ic_launcher.png
	MyEnergy/build/res/all/debug/layout/activity_main.xml
	MyEnergy/build/res/all/debug/menu/main.xml
	MyEnergy/build/res/all/debug/values-sw720dp-land/values.xml
	MyEnergy/build/res/all/debug/values-v11/values.xml
	MyEnergy/build/res/all/debug/values-v14/values.xml
	MyEnergy/build/res/all/debug/values/values.xml
	MyEnergy/build/source/r/debug/pt/uminho/myenergy/R.java