Can add & update bomb on server
Merge branch 'master' of https://github.com/MFitness/CheerRun

Conflicts:
	src/tw/mfitness/cheerrun/FragmentMap.java
	src/tw/mfitness/cheerrun/service/ControlNetwork.java
	src/tw/mfitness/cheerrun/service/ControlStatusBar.java