Added emergency contact stuff
Merge branch 'master' of https://github.com/the-river/ResearchDatabase
Added an add type button to add/edit result.  Not sure how to make it
functional.
Some more little changes hopefully you guys can fix the blue box thing
Merge branch 'master' of https://github.com/the-river/ResearchDatabase

Conflicts:
	study/edit-result.php
Merge branch 'master' of https://github.com/the-river/ResearchDatabase