Kris 15-04-2013
additions for US3
Merge branch 'master' of https://github.com/OnlineMagic/HallebaekProject.git