Upgrades finished, some other stuff fixed
Merge branch 'master' of https://github.com/paschko/iPhoneAPassignments

Conflicts:
	Odgerel/A04/RWTHGame/RWTHGame/GameViewController.m