Update license and readme.
Merge commit '31837d4634a8f3721f7ce0cf2f21021220bb88da'

Conflicts:
	LICENSE.md
	README.md