Merge branch 'master' of github.com:yandex-shri-ekb-2014/team1 into gulp

Conflicts:
	.gitignore
	package.json