added pixel color setting
Merge branch 'master' of git@github.com:wststreet2/LcdLiveWallpaper.git

Conflicts:
	LiveWallpaper/res/xml/settings.xml