Commit
Merge branch 'master' of https://github.com/Tauron1990/Radio-Streamer

Conflicts:
	RadioStreamer Slim.v11.suo
	Tauron.Application.RadioStreamer.Views/obj/Debug/Tauron.Application.RadioStreamer.Views_MarkupCompile.i.cache