empty project
removed templates
Merge branch 'master' of /Users/larsgrefer/git/empty-android-project

Conflicts:
	.gitignore
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml