dd
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/ceit/vic/platform/serviceImpl/ResourcesServiceImpl.java