[Sprint 50] canvas bo
Merge branch 'develop' of github.com:criscosg/IHorseBO into develop