unified menu
Merge branch 'develop' of github.com:studgent/android into develop