add rekeying
Merge remote-tracking branch 'origin/feature-cam-473-trust-own-keys' into feature-cam-473-trust-own-keys
add modal for bulk requests
uncomment cmlogger
Merge remote-tracking branch 'origin/feature-cam-473-trust-own-keys' into feature-cam-473-trust-own-keys

Conflicts:
	app/comps/core/srvc-user-model.js