updated copyright statement
Merge branch 'master' into feat/solrsearch