Checkpoint before pull
Merge branch 'master' of https://github.com/piaw/nutrition1

Conflicts:
	NutritionTracker/NutritionTracker/app/src/main/java/net/tigerparents/nut/FoodEntry.java
	NutritionTracker/NutritionTracker/app/src/main/java/net/tigerparents/nut/NutritionTrackerApp.java
Delete references to XML database file.
Clean up code by deleting spurious blank lines.