Merge branch 'master' of https://github.com/springside/springside4
Merge branch 'master' of https://github.com/springside/springside4
Merge branch 'master' of https://github.com/yangl/springside4

Conflicts:
	modules/parent/pom.xml