Merge remote-tracking branch 'origin/master'

Conflicts:
	CookForMe/conf/meals.yml
	CookForMe/eclipse/classes/controllers/Meals.class
	CookForMe/eclipse/classes/models/Meal.class