sd

zaebalo
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/LibJournal.pro
	src/searchbookwidget.ui