update copyright
Merge branch 'development' into greg