initial feed datamigration, because I don't like fixtures
Merge branch 'master' into develop
version info; tick setting
version info in header
Merge branch 'release/1.1'