fix wrong element order in swe:Quantity.
Merge branch 'master' of https://github.com/matthesrieke/ArcGIS-Server-SOS-Extension

Conflicts:
	src/main/resources/org/n52/sos/encoder/template_aqd_observation.xml
	src/main/resources/org/n52/sos/encoder/template_om_observation_swe_common.xml