Dev Created better dynamic models
Dev Created (new) dynamic token model and replaced most usages of the old
one.
Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05