minor bugfixes for collections & collectors
Merge branch 'master' of https://github.com/steveoro/goggles

Conflicts:
	db/schema.rb
	lib/framework/version.rb
merged commit