me
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Signed-off-by: qjj <qjj@126.com>
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: Iea80f7cabec998337de78b4306aa152de2da3744
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	file-parent/file-web/src/main/resources/tk-filters.properties
	supervisor-parent/supervisor-manager/src/main/resources/tk-filters.properties
	supervisor-parent/supervisor-manager/src/main/webapp/WEB-INF/web.xml
	supervisor-parent/supervisor-website/src/main/resources/tk-filters.properties
Change-Id: Iae66ce8eba5e1e393b941f98d30fe0b90cad53f1