libs
Merge branch 'master' of github.com:arnef/quatschen

Conflicts:
	.gitignore
	AndroidManifest.xml
	project.properties
	res/values-de/strings.xml