fixed manual merge 3
fixed manual merge 3

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