Changed to an Android Studio project
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/intermediates/manifests/debug/AndroidManifest.xml