some stuff
Merge branch 'master' of github.com:Tirmenat/solara

Conflicts:
	Stage.cpp
Merge branch 'master' of github.com:Tirmenat/solara