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