[CNAME][xs]: add CNAME for licenses.opendefinition.org.
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
updated groups, jsonp by running deploy.py
Merge pull request #13 from theodi/gh-pages

Update gh-pages branch for deployment onto licenses.opendefinition.org
Merge branch 'master' into gh-pages
Build for deploy
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:okfn/licenses into gh-pages

Conflicts:
	licenses/groups/all.json
	licenses/groups/ckan.json
	licenses/jsonp/all.js
	licenses/jsonp/ckan.js
	licenses/jsonp/uk-ogl.js
Merge remote-tracking branch 'origin/gh-pages'