Merge remote-tracking branch 'origin/master'

# Conflicts:
#	picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsurancePolicyController.java