updated models and migrations
Merge branch 'master' of https://github.com/cicadas-2014/Embark
updated models after pull request changed them
Merge pull request #68 from LasseSviland/master

updated models and migrations