Fixed some errors
Merge branch 'master' of https://github.com/jespersgaard/MJ_MVC