Merge branch 'master' of http://47.101.207.123:3000/zoro/file-online-preview

# Conflicts:
#	server/src/main/config/application.properties