update README master 2nd
conflict rebase
Merge branch 'master' of github.com:coffeedom/misc_trans into br-1122

Conflicts:
	README