Added gauge bars
Merge branch 'master' of https://github.com/bassarisse/CampJam2013

Conflicts:
	Classes/Entities/Player.cpp
	Classes/Entities/Player.h
	Classes/HelloWorldScene.cpp
	Resources/main.tmx