Modify tracking_controller
Merge branch 'master' of git://github.com/gladcube/gcapps