Merge branch 'release/1.2_3.1' into Development
Merge branch 'hotfix/1.2.1_3.1' into Development
Added demo-login
Merge pull request #67 from Firesphere/Development

Development