Merge pull request #1 from FityCity/develop

Develop
Merge pull request #2 from FityCity/develop

add viola to team list
Merge branch 'develop' of https://github.com/FityCity/FityCityApp into develop
fixed slider bug