collection fix
Merge branch 'master' of github.com:phaidra/phaidra-api

Conflicts:
	PhaidraAPI/Model/Collection.pm