1.7.2
Pixel Dungeon
typos
Merge pull request #12 from watabou/1.7.2

1.7.2
local to merge
Merge ../pixel-dungeon into eric_test

Conflicts:
	AndroidManifest.xml
	src/com/watabou/pixeldungeon/Badges.java
	src/com/watabou/pixeldungeon/Dungeon.java
	src/com/watabou/pixeldungeon/GamesInProgress.java
	src/com/watabou/pixeldungeon/PixelDungeon.java
	src/com/watabou/pixeldungeon/Preferences.java
	src/com/watabou/pixeldungeon/actors/hero/Hero.java
	src/com/watabou/pixeldungeon/actors/mobs/npcs/Blacksmith.java
	src/com/watabou/pixeldungeon/actors/mobs/npcs/Ghost.java
	src/com/watabou/pixeldungeon/actors/mobs/npcs/Imp.java
	src/com/watabou/pixeldungeon/actors/mobs/npcs/RatKing.java
	src/com/watabou/pixeldungeon/actors/mobs/npcs/Wandmaker.java
	src/com/watabou/pixeldungeon/levels/painters/ShopPainter.java
	src/com/watabou/pixeldungeon/scenes/GameScene.java
	src/com/watabou/pixeldungeon/scenes/StartScene.java
	src/com/watabou/pixeldungeon/scenes/TitleScene.java