changes from billy
cleanup
Merge branch 'feature/logo-changes' into develop