Merge pull request #1 from FityFity/spa_upgrade

Spa upgrade
Image path
Merge branch 'login_ui_enhancement' of https://github.com/FityFity/lda-siteserver into login_ui_enhancement
Merge remote-tracking branch 'upstream/master' into login_ui_enhancement