Fix bullet assertion failure
fixed identing, added comments, corrected spelling, etc.
Minor correction to patch from konstin.
Minor changes to the grand prix editor
Almost rewrite of GrandPrixData::reload()
small corrections in grand_prix_data.cpp
Merge branch 'master' of https://github.com/supertuxkart/stk-code into grand_prix

Conflicts:
	src/race/grand_prix.cpp
	src/race/grand_prix.hpp
	src/race/grand_prix_manager.cpp
	src/race/grand_prix_manager.hpp
Revert "Merge branch 'master' of https://github.com/supertuxkart/stk-code into grand_prix"

This reverts commit 2d8e711b6cd0b13fcd884188fcbf8ec52563f6e8, reversing
changes made to c3a6311b8febba837363252db2a92731e7979685.