+ .gitignore
+ .gitignore
Merge branch 'master' of https://github.com/larsgrefer/android-library

Conflicts:
	.gitignore
fixes in AndroidManifest.xml
Merge remote-tracking branch 'origin/develop'

Conflicts:
	android-library.iml
	src/main/AndroidManifest.xml