Merge pull request #127 from musamusa/master

Master
Merge pull request #147 from eHealthAfrica/develop

Update v0.2.1
Hotfix for sense contacts view
Merge branch 'develop' of github.com:eHealthAfrica/sense-ebola-dashboard into develop

Conflicts:
	app/scripts/services/contacts-factory.js