Merge branch 'hotfix/fix_gatherer'
only try to order if we have something in the order section.
Merge branch 'hotfix/merchandise_bug' into develop