integrate ui into game scene

added hud and inventory into game scene.
tweak intial display of inventory screen
Merge branch 'master' into feature/integrate-ui
fixed problems with merge
Merge branch 'feature/integrate-ui' into develop
fixed an issue with CCTime causing wisp to not fire