Merge branch 'develop'

* develop:
  Bug fix on Nav lang.
  Removed completed TODO item, removed watch from package json.