added bullet functionality to Stage
Merge branch 'master' of github.com:Tirmenat/solara

Conflicts:
	Hero.cpp
	Hero.h