lala
Merge remote-tracking branch 'origin/master'

Conflicts:
	Foodie/src/com/edu/thss/smartdental/eat/EatCalendar.java