removed git merge comments
merge ls-dev into develop