[Sprint 51] conflicts
[Sprint 51] remove ldd
Merge branch 'develop' of https://github.com/criscosg/IHorseBO into develop
[sprint 51] change new url