Merge branch 'master' of https://github.com/DaniilBorodin/STRBTH

Conflicts:
	testcases/sites/pavel_yii_dev_rbth_net.xml