lanxi
Merge branch 'develop' of https://github.com/eqielb/Lotus-L into develop
lanxi: readme
Merge branch 'master' into develop

Conflicts:
	README.md
lanxi: readme