Merge branch 'hotfix/47'
Merge branch 'develop'
logout button is now always working
protocol is now set to http not https
background color is now white, transitions are beautiful again
Merge branch 'hotfix/48' into develop