Merge branch 'release/7.x-0.6' into develop
Adjust user settings for more complex tabs like custom search
Make sure cache is not serialized
Merge branch 'feature/393-usersettings' into develop
updated to version 7.x-0.7
Merge branch 'release/7.x-0.7'