Merge branch 'dev' into 'master'

backend/secfit/comments/tests.py

backend/secfit/comments/views.py

backend/secfit/secfit/djangoHeroku.py

backend/secfit/secfit/settings.py

backend/secfit/secfit/views.py

backend/secfit/users/admin.py

backend/secfit/users/serializers.py

backend/secfit/users/tests.py

backend/secfit/users/views.py

backend/secfit/workouts/models.py

backend/secfit/workouts/parsers.py

backend/secfit/workouts/serializers.py

backend/secfit/workouts/tests.py

backend/secfit/workouts/urls.py

backend/secfit/workouts/views.py

frontend/www/exercise.html

frontend/www/scripts/exercise.js

frontend/www/scripts/workouts.js