使用Springside初始化
Merge branch 'master' of https://github.com/hcit-develop/portal

Conflicts:
	.gitignore