系统信息
welcome.jsp
Merge branch 'master' of https://github.com/tangooo/tango-system

Conflicts:
	tango-basic-system/src/main/java/org/tango/basic/controller/IndexController.java
更新系统信息
更新系统信息页面
初步整合
update welcome
Merge branch 'master' of https://github.com/tangooo/tango-system

Conflicts:
	tango-basic-system/src/main/java/org/tango/basic/controller/IndexController.java
update welcome.jsp
update IndexController