commit
Merge branch 'master' of https://github.com/n2a5me/altp.git

Conflicts:
	src/com/nmn/game/scene/MenuHUD.java
commit
Merge branch 'master' of https://github.com/n2a5me/altp.git