test from web storm 7
Merge remote-tracking branch 'origin/master' into bugfix

Conflicts:
	README.txt
git flow