fMerge branch 'master' of https://github.com/kolesnikovkhv/basefm

Conflicts:
	public/css/volt.blue-orange.css
Merge branch 'master' of https://github.com/kolesnikovkhv/basefm