add tmp.txt
modify tmp.txt
delete tmp.txt
fix db migrations
Merge branch 'develop'
Merge pull request #1 from jakobcho/master

sync to latest