Rotation redone 2
Merge branch 'master' of https://github.com/olivergeith/android_wallpaperDesigner

Conflicts:
	src/de/geithonline/wallpaperdesigner/settings/Settings.java