Dev Fixed some token issues.
Removed unused simpletest library.
Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05