Loxy productcontroller TASK 1.2 (ongoing)
Merge branch 'master' of https://github.com/OnlineMagic/HallebaekProject.git