Hoppar tillbaka för att fixa merge conflict
Revert "Hoppar tillbaka för att fixa merge conflict"

This reverts commit eb56b5c4f13ecca013e5710b9c28f1faf087d229.
Merge branch 'carl' into image-upload
Merge branch 'vecka22' into image-upload
Migrations utan AutomaticMigrations
Merge branch 'vecka22' into migrations
DataURL för NewsFeedItem
Merge branch 'vecka22' into carl
Merge branch 'vecka22' of https://github.com/RobPas/MiniFB into Jesper