minor edits
Merge remote-tracking branch 'origin/master'

Conflicts:
	designing-for-clinicians/medication-list.php