mapEditor work
Merge branch 'Master' of https://github.com/killje/OGP.git into Master