test x2
Merge branch 'master' of github.com:domexbg/web

Conflicts:
	common/borisbratoev/readme.txt