added a warning in the git process
more merge text removal
additional text about the process on git
update html build of developdocs
Merge branch 'ls-dev' into develop