Adds FPS counter to Sidebar
Merge branch 'master' of https://github.com/AstroTeam/Game

Conflicts:
	astro_demo/src/Gui.cpp