* branding
* resolved conflict
* add placeholder
Merge branch 'develop' of https://github.com/syrix/lendabook into develop