Merge branch 'master' into gsoc18-iconview-sort

Authored by mqualmann on Jun 20 2018, 5:29 PM.

Description

Merge branch 'master' into gsoc18-iconview-sort

Merged Changes

CommitAuthorDetailsCommitted
b62539aea69cmqualmann
add manualOrder column to the database migration process 
Jun 20 2018
c5835d5deb01mqualmann
enable database update to V10 
Jun 20 2018
2501c88c7ed9mqualmann
merge changes to dbconfig.xml from gsoc18-iconview-sort branch 
Jun 20 2018