change package name and fix calories range bug
merge shan maho