rest/menu php refactor done
Merge branch 'jay'