Merged in menu and replay changes into master
Manager menu and replay integrated with master on github