Merge branch 'v0.2.1' of https://github.com/00-Evan/shattered-pixel-dungeon
Changes in v0.2.1c

Conflicts:
	src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java

Additionally:
   Improved challenge characteristics (now armor challenge removes the reward menu button, rather than giving cloth armor)