Merge remote-tracking branch 'weteam/master'
Merge branch 'merge'
Merge branch 'master' into tulon

Conflicts:
	pom.xml
Quick fix for Player.getMaxHealth 1.6.1 api change.
Merge branch 'master' into merge

Conflicts:
	pom.xml
Merge branch 'tulon' into merge

Conflicts:
	pom.xml