test commit
clear pass
Merge branch 'master' of https://github.com/hpnguyen/sdh

Conflicts:
	source_web_origin/libs/connect2.php
Merge branch 'master' into release1