Rewrites for production
Merge branch 'develop'
Merge branch 'develop' of github.com:fredriktid/CodeKeepr into develop