Working Apple
Merge branch 'origin/gh-pages'

Conflicts:
	BroadsideRepo/Broadside/bin/Broadside.apk
	BroadsideRepo/Broadside/bin/classes.dex
	BroadsideRepo/Broadside/bin/classes/com/starboardstudios/broadside/R$id.class
	BroadsideRepo/Broadside/bin/classes/com/starboardstudios/broadside/controller/PlayController.class
	BroadsideRepo/Broadside/bin/classes/com/starboardstudios/broadside/controller/UpgradeController.class
	BroadsideRepo/Broadside/bin/resources.ap_
	BroadsideRepo/Broadside/gen/com/starboardstudios/broadside/R.java
Working Apple Format