add page 4 and fix titlebar
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/android/src/lockfun/src/com/pinping/game/MainActivity.java