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