tiny changes, hopefully no merge conflicts
Merge branch 'develop' of https://github.com/slgsoccer/Fab-Fashion into develop