config https changes
resolved merge conflcits
ie interim fix
jsonp ie fix