improve PrepareVelocityContext TODO
Merge branch 'dev' of git@github.com:celements/celements-core.git into dev