Merge branch 'develop'

* develop:
  adding simple dropdown menu