java docs for Equipment, LivingEntity, MovableEntity, and Weapon
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/novak/gameobjects/LivingEntity.java
java doc for Living Entity