remove broken css truncation
added social history merge UI
Merge pull request #153 from amida-tech/its-friday-v2

social history merge UI
Merge branch 'master' into mcFriday
working scripts, bump angular, better demo files.