DSS-271: Ordering of timestamps
Merge branch 'develop' of http://git.aris-lux.lan/git/dgmarkt-dss into develop