conflict fix
nothing done
Merge branch 'dev' of github.com:VectorWinner/takeaway into dev