adding filter support
Merge branch 'master' of https://github.com/mjhamm75/angular-clinical

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/encounter.controller.js