Merge branch 'master' of https://github.com/miselaytes-anton/noise-voice

Conflicts:
	public/_/js/_main.js
Merge branch 'master' of https://github.com/miselaytes-anton/noise-voice