sync
Merge branch 'master' into dev
update menu and associated styles
Merge pull request #6 from ashtonthomas/dev

context menu and styles