Merging lastest changes

Fixes preserve markup bug

Cleaning textParser source code

Preventing text into image paragraphs

Allowing blockquote separation and joint