Merge branch 'newBranch1'

Conflicts:
Branch/branch_file1.php
Branch/branch_file2.php
Merge/merge_file1.php