minor fixes
Merge branch 'master' of https://github.com/EyeWumbo/5Dev

Conflicts:
	src/handler/Button.java