waye 6 commit
Merge branch 'master' of https://github.com/waynetunmyint/php

Conflicts:
	scope.php