Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/yugy/qianban/activity/MainActivity.java