Fix user-opitons
Merge branch 'master' of https://github.com/Telerik-Hackathon-2014/YourFood