Merge branch 'hotfix_text_additions'
Updated PDF
Merge branch 'hotfix_pdf_parathed' into development