Bugfix handle model and collection separately

issue #1533

- replaces templateModel which was a weird hybrid with progressModel and progressCollection
Merge pull request #1544 from ErisDS/client-model-fix

Bugfix handle model and collection separately