Supporting activation and deactivation of metrics
Merge branch 'dev' of https://github.com/jlcanovas/collaboro into dev