layout
fix db issue
Merge branch 'master' of https://github.com/EladYona/FoodChain.git