adds calories to products and quick stats
Merge branch 'master' into calories
removes helper function
Merge branch 'calories' into statistics

Conflicts:
	Gemfile.lock