NullVirusScannerImpl and minor change to virus-scanner-context.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/src/main/java/org/craftercms/social/services/impl/VirusScannerServiceImpl.java
NullVirusScannerImpl and minor change to virus-scanner-context.xml