merge dev to master

MVP with menu and demo