fixes Social History merges display
removed duplicate in first demo r1.2 file
Merge pull request #185 from amida-tech/dmitry-demo-review

Dmitry demo review