Update: TransitionDayAction.java, TransitionDayForm.java, TransitionDay.jsp, transitionDay.js
Merge conflict solved: web.xml