Refactored code of Anthony to multiple objects. (CO-OP: Anthony Hetem)
Merge branch 'HelmTeam4' of github.com:gametechnology/psi-2013 into HelmTeam4