improved robustness of craving meter
lazy commit merge
Merge branch 'master' of https://github.com/gsaito/SF28v4

Conflicts:
	www/js/app.js~