dew
Merge branch 'master' of https://github.com/EKo3t/RadioCatalog

Conflicts:
	RadioCatalog/Scripts/Editor/Editor.js
	RadioCatalog/Views/Account/UserProfile.cshtml
	Resources/Resources.Designer.cs
	Resources/Resources.Ru.resx
	Resources/Resources.resx