PDF generation added
Merge branch 'feature/report' into develop
Report conflict solved