Update fixtures
Merge branch 'master' of github.com:smartstudy/smartstudy-home
Merge branch 'master' of github.com:smartstudy/smartstudy-home