edit
Merge branch 'master' of https://github.com/eawapownikov/bookcreator

Conflicts:
	bookcreator.clpprj