fixed manual merge
fixed manual merge

rob-hills/Booktype,ride90/Booktype,danielhjames/Booktype,aerkalov/Booktype,eos87/Booktype,MiczFlor/Booktype,olegpshenichniy/Booktype,kronoscode/Booktype,ride90/Booktype,olegpshenichniy/Booktype,sourcefabric/Booktype,aerkalov/Booktype,rob-hills/Booktype,btat/Booktype,kronoscode/Booktype,rob-hills/Booktype,MiczFlor/Booktype,danielhjames/Booktype,okffi/booktype,aerkalov/Booktype,sourcefabric/Booktype,sourcefabric/Booktype,sourcefabric/Booktype,eos87/Booktype,danielhjames/Booktype,okffi/booktype,olegpshenichniy/Booktype,ride90/Booktype,kronoscode/Booktype,kronoscode/Booktype,danielhjames/Booktype,ride90/Booktype,MiczFlor/Booktype,MiczFlor/Booktype,olegpshenichniy/Booktype,danielhjames/Booktype,olegpshenichniy/Booktype,rob-hills/Booktype,btat/Booktype,btat/Booktype,btat/Booktype,MiczFlor/Booktype,okffi/booktype,kronoscode/Booktype,eos87/Booktype,okffi/booktype,okffi/booktype,sourcefabric/Booktype,eos87/Booktype,ride90/Booktype,eos87/Booktype