update
fix bug in local version
Merge branch 'for_local2' into master_english

Conflicts:
	client/projects/proj.android/src/com/crazyass/game/crazyass.java
fix bug