Changes made by Duc Nguyen (ducnt@vnyi.com).
Changes made by Duc Nguyen (ducnt@vnyi.com).
Merge branch 'master' of https://github.com/tung-nguyen7691/EziMobile.git

Conflicts:
	EziMobile/views/getGroupFood.html