FoodLog
Merge branch 'master' of https://github.com/AtulanZaman/HealthyEatingApp

Conflicts:
	Code/HealthyEatingApp/war/WEB-INF/classes/com/google/gwt/sample/healthyeatingapp/server/DBConnectionServiceImpl.class
Merge branch 'master' of https://github.com/AtulanZaman/HealthyEatingApp
Merge