Merge origin/master

Conflicts:
	Zelda TMQ/src/com/kitmaker/engine/Sound.java
Merge origin/master