add front jsp page
merge front page branch
Merge branch 'dev' of github.com:hellojian123/TradeMark into dev