Merge remote-tracking branch 'git-pipIrr/master'

# Conflicts:
#	pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java