Migrations och shit
Merge branch 'master' into patric
allt funkar........... like a charm