master 1 contributing"

Change-Id: I0969822346556d8f693b578277704723498ed27a
dev 1 lic

Change-Id: Id4530bdd3ed0a40745441ff38ac4dffab8c6f60f