Kris 06-04-2013 v1.4
Bug fixes
Merge branch 'master' of https://github.com/OnlineMagic/HallebaekProject.git