[d-136] Get 'watch' subtask back.
Merge branch 'master' into d-136-grunt

Conflicts:
	grunt_project/Gruntfile.js
[d-139] Fix perepravy.html