changed java.util.Date to java.sql.Date
wip
merge
model + controller