TradeSearchDao.java index.jsp login.jsp
commit file
trademarkDao.java and TrademarkService.java update Trademark.java-->trademarkName field
Merge branch 'dev' of github.com:hellojian123/TradeMark into dev