Dev Added code completion for Token::model($surveyId) and created helper
function Token::create($surveyId, $scenario) to enable code completion.
Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05

Conflicts:
	application/models/Dynamic2.php