renamed:    resources/tracks/simple-circle.xml -> resources/tracks/simple-circle-old.xml
	modified:   resources/tracks/simple-circle.xml
	modified:   src/global_renderer.cc
Merge branch 'master' of https://github.com/freescale-cup-simulator/simulator