onclick verification for deletion and activation did not work
adaptions to bootstrap 3
monitoring html..
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
adaptions for bootstrap 3
Merge branch 'master' into md5hash

* master:
  adaptions for bootstrap 3
  monitoring html..
  adaptions to bootstrap 3
  onclick verification for deletion and activation did not work
import version