link to license
consolidate openshift and master
Merge branch 'master' into salesforce