Merge branch 'newui' of https://github.com/lancearthur/bookreader into newui