WIP
Merge branch 'master' into Fix-UI
Fix for multiple users
Removal of CSS3 transition for DIV elements
Merge pull request #780 from DavidChristiansen/Fix-UI

Fix ui