Merge branch 'master' into AboutDialog
added copyright text as HTML
cleanups
Merge branch 'AboutDialog'