add welcome page， please input localhost:port/<project>/welcome.action
Merge remote-tracking branch 'origin/master'