tpl
Merge branch 'develop' of github.com:octoberry/qiwihack into develop

Conflicts:
	templates/index.html