Umstellung auf Android 5.0
Merge branch 'master' of https://github.com/olivergeith/android_wallpaperDesigner

Conflicts:
	project.properties