new toolkit version and better collections
Merge branch 'tmp'
Merge branch 'master' of https://github.com/getkirby/kirby
bugfixes in user and toolkit