updated storage schema for graphite
Merge branch 'dev' into production