deps updated
atmo with billing charts
Merge branch 'master' into stable

Conflicts:
	Gemfile.lock