[MapEditor] Fixed build errors for JDK6
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #45 from frkarl/develop

Fixed JDK6 Build errors