Updated copyright notices
Merge branch 'origin/inventory'