merge ls-dev into develop
added a warning in the git process
more merge text removal
update html build of developdocs