bug fixes
Merge branch 'master' of github.com:CyanDreamProject/android_packages_apps_wallpapers

Conflicts:
	src/com/cyandream/CyanDreamWallpapers/SolidColor.java
	src/com/cyandream/wallpapers/SolidColor.java
	src/com/paranoid/ParanoidWallpapers/SolidColor.java