Editing data page and other stuff
Merge branch 'development' of github.com:wyne/log into development