* renamed model package to entity
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/metamud/rest/CharacterResource.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/paizo/pf/core/combat/AttackRoll.java
* renamed model package to entity