ad changes
Merge remote-tracking branch 'origin/branch_game_controller'

Conflicts:
	BusinessSim/src/com/game/businesssim/Business.java
	BusinessSim/src/com/game/businesssim/GameControllerActivity.java