Update.
Merge branch 'master' of github.com:virtualabs/Vodstok

Conflicts:
	server/vodka/index.html