Merge branch 'development' of git://github.com/jonutter/kuality-coeus into development

Conflicts:
	lib/kuality-coeus/data_objects/users.yml
Merge remote-tracking branch 'origin/development' into development