Merged localBranch and localBranch.php with master

Merged a localBranch and localBranch.php to master branch