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

Conflicts:
	coo-m-game/src/com/coo/m/game/robot/TulingActivity.java