UI and stuff
Merge branch 'master' of https://github.com/Ichmed/Vloxlands.git

Conflicts:
	src/com/vloxlands/ui/ProgressBar.java