Fixed page-proofs
merge with develop
Merge branch 'Route_view' into develop