update readme file
Merge remote-tracking branch 'origin/master'

Conflicts:
	configuration-python/generic_code/README.md
Merge remote-tracking branch 'origin/master'
update readme file