preparing for studio 0.2
adding new gitignore from abs repo
Revert "preparing for studio 0.2"

This reverts commit b290efcde5e051b57246ac4b8a10136967048b75.
Merge branch 'master' of https://github.com/myhealth/MyEnergy

Conflicts:
	.gitignore
	.idea/compiler.xml
	.idea/gradle.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	MyEnergy/MyEnergy.iml
	MyEnergy/build.gradle
	MyEnergy/src/main/AndroidManifest.xml
	MyEnergy/src/main/ic_launcher-web.png
	MyEnergy/src/main/res/drawable-hdpi/ic_launcher.png
	MyEnergy/src/main/res/drawable-mdpi/ic_launcher.png
	MyEnergy/src/main/res/drawable-xhdpi/ic_launcher.png
	MyEnergy/src/main/res/drawable-xxhdpi/ic_launcher.png
	MyEnergy/src/main/res/values/strings.xml
	MyEnergyProject.iml
	gradle/wrapper/gradle-wrapper.properties
	local.properties
	settings.gradle