updated copyright year
Merge branch 'dev' into github-master
spell check
Merge branch 'dev' into github-master