.
Merge branch 'master' of git@github.com:wststreet2/LcdLiveWallpaper.git

Conflicts:
	LiveWallpaper/src/lwp/MyWallpaper.java