Merge branch 'master' into Development

* master:
  wrong branch images
  misspelled link
  started development of settings panel
  reorganized screenshots