sync fluff design docs
Merge branch 'master' into fluff_sync
Merge pull request #360 from dimagi/fluff_sync

sync fluff design docs