Merge branch 'spring4' of https://github.com/zcteng/bravo.git into
spring4

Conflicts:
	bravo-container-spring/src/main/resources/bin/appserver.sh
style changed