Initial commit
Merge branch 'develop'
Fixed the inconsistency in the menu