First step to second user story
Merge branch 'HelmTeam5' of github.com:gametechnology/psi-2013 into HelmTeam5