Quick commit to sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	leveleditor.py