Use content position for content template order. Fixes #774
Merge branch 'master' of github.com:wheelcms/wheelcms_spokes