Merge branch 'master' into develop

Conflicts:
webclient/js/functionsvars.js
small updates
small updates/bugs
bugfix for safari, searchresults
Some style changes
Merge branch 'refs/heads/develop' into stopButton