.
Merge branch 'development' of github.com:jarno-steeman/onion into development

Conflicts:
	src/extensions/collection.js