Merge branch 'master' into sok-family

Authored by rkaur on Feb 27 2016, 10:49 AM.

Description

Merge branch 'master' into sok-family

Merged Changes

CommitAuthorDetailsCommitted
260d2949675djjazeix
template, put 2016 for the copyright year 
Feb 27 2016