fix(expired) - check for old schema as well
Merge remote-tracking branch 'adrian/fix-expired'
feat(preferences) - change the way user preferences are registered.
feat(preferences) - unified /preferences and /available_preferences under /preferences
Merge remote-tracking branch 'upstream/master'