test commit to simon's branch
add models and all changes
notes on db migration and
two more new files
abandon direct merge
no way back
Merge branch 'simon'
merged with simon