Commit to get in sync

-Few bug fixes regarding party's

-Code cleanup in CRCharacter.java

-Bug fixes regarding nametags