Fix delete button #2
Click on button add full servings
Merge branch 'master' of github.com:shawnlauzon/man20-macronutrient-tracker

Conflicts:
	www/js/services.js