Add ordering on date aswell. Order priority is date,jouanlnummer
Merge branch 'hotfix-1.0.4' into develop