Revert "Revert "Merge pull request #1140 from dimagi/show-id""

This reverts commit 470c74a0c1c8880d4a2ce249020fc4df62f5db6e.
Merge branch 'master' into show-id
Merge branch 'show-id' into staging