Merge remote-tracking branch 'origin/master'

Conflicts:
	CookForMe/app/views/Meals/browse.html
	CookForMe/eclipse/classes/models/User.class