Change public display map print functionality
Added entities for Progress Report
Merge remote-tracking branch 'upstream/master' into test