add mvp indicator pillows to settings instead of localsettings
Merge pull request #1041 from dimagi/indicator-pillows

add mvp indicator pillows to settings instead of localsettings
add requirements/jsonobject-couchdbkit.txt

for installing jsonobject-backed couchdbkit locally
will be removed once the transition is finalized
Merge pull request #1044 from dimagi/jsonobject-couchdbkit-requirement

add requirements/jsonobject-couchdbkit.txt
Merge branch 'master' of github.com:/dimagi/commcare-hq into settings-users-split
show the commtrack navigation here...oops