Basics tutorial, countdown before test/workout, 1 alert for multiple badges. Fixed options menu bug.
Merge remote-tracking branch 'origin/master'