bower and fix index.html
Merge branch 'master' of github.com:yandex-shri-ekb-2014/team2

Conflicts:
	index.html