update file filter
Merge origin/master

Conflicts:
	src/com/toyknight/aeii/mapeditor/core/EditorData.java