Bluetooth compromise
Merge remote-tracking branch 'origin'

Conflicts:
	src/com/cjk/thecloud/controllers/BattleController.java