Updated to Bukkit 1.5.2-R0.1
Merge branch 'master' of https://github.com/trc202/Combat-Tag

Conflicts:
	plugin.yml
Fix warning