Fix models with FK and naming
Merge branch 'master' of https://github.com/ollehallman/InternetApp.git