improve collection model
Merge branch 'master' of git://github.com/atk4/testsuite

Conflicts:
	lib/Model/Collection.php