Merge branch 'master' of https://github.com/Selech/pixel-dungeon

Conflicts:
	src/com/watabou/pixeldungeon/levels/Level.java
	src/com/watabou/pixeldungeon/levels/RegularLevel.java
	src/com/watabou/pixeldungeon/levels/Terrain.java