Merge branch 'development' into feature/editable-entries
revert to old controller
entry numbers work again
remove comments
Merge pull request #51 from erumble/feature/editable-entries

Feature/editable entries