partials
Merge branch 'temp2' - final partial

Conflicts:
	fitness_track_app/onepageapp/Models/food.php
	fitness_track_app/onepageapp/Views/diet-control/edit.php
	fitness_track_app/onepageapp/Views/shared/_template.php
	fitness_track_app/onepageapp/content/js/diet-control.js