Merge remote-tracking branch 'origin/master'

Conflicts:
	CookForMe/conf/users.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	CookForMe/eclipse/classes/models/User.class