Fixing autocomplete on token model
Merge branch '2.05' of https://github.com/LimeSurvey/LimeSurvey.git into 2.05

Conflicts:
	application/models/Token.php