update to Bukkit 1.5.2-R1.1
Merge branch 'master' of github.com:MinecraftWars/Gringotts

Conflicts:
	pom.xml
remove empty code or something?
update maven-shade-plugin for mvn 3.1 compatibility