Start cleaning up books.tpl  (alpha)
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into partitionCBP