Copyright end year changed
Merge branch 'master' into hp_content_fix