Lots of new Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pixel Hero/src/com/teamanubiz/pixelhero/GameLoader.java
	Pixel Hero/src/com/teamanubiz/pixelhero/Item.java