master
Add/update copyrights
Update CUPS icons to new OpenPrinting CUPS logo.
Merge changes from CUPS 1.5svn-r8849.
Add Chinese web UI templates
