Closed myapnea/www_myapnea_org#102. Fixed failing tests
Merge branch '2-0-dev' of github.com:myapnea/www_myapnea_org into 2-0-dev