Fixed NPE
Merge branch 'master' of https://github.com/Ichmed/Vloxlands.git

Conflicts:
	src/com/vloxlands/util/MediaAssistant.java