Editor continued
Merge branch 'master' of https://github.com/Arttuv/louhieditor

Conflicts:
	Louhieditor/src/com/louhigames/editor/Louhieditor.java