Merging ajax and table view
Merge branch 'master' of https://github.com/bpham-work/PatientSafetyBro

Conflicts:
	app/controllers/index.js