Dynamic chartbeat module
Merge branch 'dev'
Merge branch 'master' of https://github.com/codemariner/cambio

Conflicts:
	package.json