Proper buttons in merge (with Save/Ignore updates)
updated fontello font to just two icons used
sample demo test update (partials test)
medications testing.
All tests running.
Added count to grunt.
Merge pull request #24 from amida-tech/mm-more

Mm more tests.
cleanup
cleanup again
removed fontello and replaced icons with new ones
Merge branch 'master' into its-friday
Merge pull request #25 from amida-tech/its-friday

Its friday
Merge pull request #26 from amida-tech/mm-more

Mm more
Integrated match UI with API
encounters fixes.
fixed JS error with interpolation on matches
some linting, commented jshint src path for future use
clean null display option
Merge pull request #28 from amida-tech/some-branch

UI Fixes.
Merge branch 'master' into afsin