Users add list to history working
Users add list to history working
Users add list to history working
Users add list to history working
Merge branch 'master' of https://github.com/Telerik-Hackathon-2014/YourFood

Conflicts:
	server/logs/errors.log