add third page(2) fouth page(ui-1)
Merge branch 'master' of https://github.com/wwwangcai/lockfun

Conflicts:
	client/android/src/lockfun/res/values/styles.xml