Test Branch Commit
Test Branch Commit2
Merge pull request #1 from ptrick/Map-Editor-Branch

Testing Branch Merge