ss
changes
adss
Merge branch '1.0' of https://github.com/stobiaskoch/ownsound into 1.0

Conflicts:
	config.inc.php
Merge branch '1.0' of https://github.com/stobiaskoch/ownsound into 1.0