* Merged with dev
Merge branch 'master' of https://github.com/asenovm/book-search-server