Merge framework/master

Conflicts:
	LICENSE
	README.md