Merge branch 'feature/utility-classes' of git.startinblox.com:applications/sib-app into feature/utility-classes