15.05
15.05

Merge branch 'master' of github.com:fenix20113/soundche

Conflicts:
	configuration.php