Merge "Fix serious data loss issue for folders and hotseat items" into ub-now-mister-ugly

                // which no longer exist. Since this can cause other problems, and since the user

                // will never see these items anyway, we use database upgrade as an opportunity to

                // clean things up.

                removeOrphanedItems(db);

                // TODO: this needs to be fixed, currently causes data loss.

                //removeOrphanedItems(db);

                version = 18;

            }