Merge branch 'master' into develop
quick fix for soundcloud, sortof
even more quick fix for soundcloud
Merge branch 'master' into develop

Conflicts:
webclient/js/functionsvars.js
small updates
small updates/bugs
bugfix for safari, searchresults
Webclient used in MusicBox 0.4.2

added shutdown/reboot
initial work for settings page
Merge branch 'develop'

Conflicts:
	flatclient/css/webclient.css
	flatclient/index.html
	flatclient/js/controls.js
	flatclient/js/functionsvars.js
	flatclient/js/gui.js
	flatclient/js/library.js