Merge branch 'release/7.x-0.1' into develop
stay on tab when saving user-settings
updated to version 7.x-0.2
Merge branch 'release/7.x-0.2'