nicer optics
Merge branch 'xmlfix' into dev

Conflicts:
	WPS/res/layout/activity_measure.xml
	WPS/src/de/rwth/ti/common/IPMapView.java
solved conflict
Merge branch 'dev' into tcuje