Merge branch 'feature/loader' into develop
Merge branch 'develop' of https://github.com/tpott/butter-star into develop