some conceptional stuff
some conceptional stuff
sha1 hashing over files and streams
rollback query version
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
sevral fixes regarding file hashing
replication fixes
Merge branch 'md5hash'

* md5hash:
  replication fixes
  sevral fixes regarding file hashing
  import version
  rollback query version
  sha1 hashing over files and streams
  some conceptional stuff
  some conceptional stuff
TODO cleanup
some cleanup
Merge branch 'master' into monitoring