Initial commit
Merge remote-tracking branch 'origin/master' into feature/api-21-open-source

Conflicts:
	README.md