update-20141225
Merge remote-tracking branch 'origin/master'

Conflicts:
	coo-m-game/src/com/coo/m/game/GplusManager.java
update-20141225