formatting
Merge branch 'master' of github.com:oat-sa/doc-converter

Conflicts:
	php/Userguide/Converter/ConverterTask.php
	php/Userguide/Helpers/Indexer.php
Fixed 'slashes' issue on Windows
Linking pages in epub finished
prevent incorrect merging documents with links maps
Fb2 support for ebooks added
Fb2 support for ebooks added
Icons now in the mapping list and can be used
Merge pull request #1 from oat-sa/master

test