Change public display map print functionality
Added services and TO for Progress report
Merge remote-tracking branch 'upstream/master' into test