Merge branch 'newui' of git@github.com:rajbot/bookreader into newui