Merge remote-tracking branch 'origin/john'
Map Editor

Added XML saving functionality. Now working on XML loading.
Merge branch 'master' of https://github.com/Im-Laodicean/you-re-trash
Merge remote-tracking branch 'origin/master' into john