Remove diamond types to compile with 1.6 instead of 1.7. Also fix pom.xml issue where I forgot to replace WorldPos with SimpleTeamChat.
Merge remote-tracking branch 'origin/master'