onclick verification for deletion and activation did not work
Merge branch 'master' of github.com:comsysto/jumbodb into monitoring

Conflicts:
	database/src/main/webapp/partials/collections.html
	database/src/main/webapp/partials/deliveries.html