Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/bfkj/unidia/DataBaseUtils/DbParamsService.java