Small fixes
Merge branch 'master' of https://github.com/Nekrasovnetut/sherlockweb into develop

Conflicts:
	assets/js/main.js
	assets/js/main.min.js