Use MIT license
Merge branch 'master' into cdata-master

Conflicts:
	package.json