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

Conflicts:
	.gitignore