add discount and drawback from kitchen
add discount and drawback from kitchen
Conflicts:
	www/app.js
	www/config.xml
	www/index.html
	www/resources/css/cupertino.css