Rename README to README.md
Merge remote-tracking branch 'origin/master' into 1_3_api

Conflicts:
	README