Added ssl to login.jsp and display_checkout.jsp
resolved merge conflict