#853 - fixed disabled info icon issue
generated files
merging
cleanup of statistics, new css, merge css, view and template, added long/short history, exclude all statistics collections, added clusterId
Merge branch '2.1' of github.com:triAGENS/ArangoDB into 2.1