Quickfix

Conflicts:

	leftside/src/main/java/lv/javaguru/java2/database/jdbc/TodoGroupDAOImpl.java
	leftside/src/main/webapp/WEB-INF/web.xml