1.7.4
Merge branch 'master' of github.com:Trott/apis.ucsf.edu

Conflicts:
	package.json