Update readme.md
Update readme.md
Update readme.md
Merge branch 'master' into dev

Conflicts:
	Documentation/readme.md