Merge branch 'master' into mcFriday
Merge pull request #153 from amida-tech/its-friday-v2

social history merge UI
Reactions more functional.
Merge branch 'master' into mcFriday
working scripts, bump angular, better demo files.
Merge pull request #154 from amida-tech/mcFriday

matching wrappers working.
Merge branch 'master' into its-friday-v2