Merge pull request #1 from FityFity/spa_upgrade

Spa upgrade
Merge remote-tracking branch 'upstream/master' into usergroup_ui