Fixes.
Merge branch 'master' of github.com:anidev/612-2013
(this is definitely a glitch) *sigh*
Conflicts:
	states/state_driving.cpp