no message
Merge branch 'master' of github.com:ANTON072/project_template

Conflicts:
	_grunt/Gruntfile.coffee