789
Merge branch 'master' of https://github.com/kada-cliu/wall_paper.git

Conflicts:
	src/com/china/bida/cliu/wallpaperstore/view/BaseActivity.java
	src/com/china/bida/cliu/wallpaperstore/view/login/LoginActivity.java