Google Style Guide
Fix conflicts in performance.js
Fix bug
Update performance.js
Merge branch 'unstable' of https://github.com/PDI-DGS-Protolab/performanceFramework into unstable
Merge branch 'unstable'