Merge branch 'draft_version' into 'develop'

order columns

See merge request !16
1 job for develop in 1 minute and 2 seconds (queued for 5 seconds)