fix automatic merging with develop(tender.jsp)
add in JSP corect date, it works but with some bugs(static)