Fixed items on bosslevels.
Merge branch 'master' of https://github.com/QuattroX/pixel-dungeon.git

Conflicts:
	src/com/dit599/customPD/levels/template/TemplateFactory.java