Updated web-app schema
Updated Menus android, web-app
Updated Functional requirements