Update for 1.5.1
Merge branch 'upstream'
Update to 1.5.1-R0.1
Fixed GitHub Issue #13
Merge branch 'master' of https://github.com/trc202/Combat-Tag

Conflicts:
	CombatTag/com/trc202/CombatTagListeners/NoPvpPlayerListener.java
WIP