[OES-169] Fix broken segmented field js
+ [OEM-98] customise print layout for new css elements
[OEM-100] gonio-cross style fix
Merge branch 'master' into develop

Conflicts:
	assets/css/module.css