Added next vehicle button.

Improved XML parser performance by removing unused code.
Fixed previous fix.
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013