Merge branch 'master' of https://github.com/Realexer/WindowClimberCocos2d

Conflicts:
	Window Climber/Resources/Images/EmergencyOverlays/EmergencyOverlay-Blue-hd.png
	Window Climber/Resources/Images/EmergencyOverlays/EmergencyOverlay-Red-hd.png