merge all the changes under version 2.34
merge all the changes under version 2.34

tcmitchell/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal