change as json
Merge branch 'master' of https://github.com/github-sprint3r/khruayou

Conflicts:
	menu_item/menu_item.html
fix template