Adding user and group zap support
removing the user/group and try to make the zap class more general
Merge branch 'fix_zap_class'

Conflicts:
	libraries/default.rb