Merge branch 'game-logic' into Bioharness

Conflicts:
	bin/classes/com/william/r_tug/BioHarness$1.class
	bin/classes/com/william/r_tug/BioHarness$2.class
	bin/classes/com/william/r_tug/BioHarness$3.class
	bin/classes/com/william/r_tug/BioHarness$BTBondReceiver.class
	bin/classes/com/william/r_tug/BioHarness$BTBroadcastReceiver.class
	bin/classes/com/william/r_tug/BioHarness.class
	bin/com.william.r_tug.MainActivity.apk
	bin/dexedLibs/BioHarnessBT-c62e38cd8ddefbe38c632cd95a99e9ac.jar
	src/com/william/r_tug/BioHarness.java