Merge branch 'dev' into 'master'

.idea/workspace.xml

backend/secfit/.coverage

backend/secfit/secfit/settings.py

backend/secfit/users/tests.py

backend/secfit/workouts/.gitignore

backend/secfit/workouts/geckodriver.log

backend/secfit/workouts/permissions.py

backend/secfit/workouts/seleniumLeaderboardSystemTest.py

backend/secfit/workouts/seleniumLikeSystemTest.py

backend/secfit/workouts/tests.py

backend/secfit/workouts/views.py

frontend/www/exercise.html

frontend/www/scripts/exercise.js

frontend/www/workouts.html