Merge branch 'master' of github.com:anathema/anathema

Conflicts:
	Character_Main_FX/src/net/sf/anathema/fx/character/perspective/CharacterGridFxView.java