Fixed nullpointer in Controller
Merge branch 'master' of https://github.com/Kuxe/oopprojekt