Fixed actions, dao, entity, filters, jsp
Merge remote-tracking branch 'origin/master'