Patient Report Update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	simpler/ermanager/templates/simpler/home.html
Merge branch 'master' of https://github.com/kylambouldin/sharklightning-hackathon