Added items
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/ajwgeek/games/bossrush/server/world/entity/EntityPlayer.java