Merge branches 'develop-Actinia' and 'master' of https://git.oschina.net/egzosn/pay-java-parent into develop-Actinia

# Conflicts:
#	README.md

pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java

@@ -45,7 +45,6 @@ public class UnionPayConfigStorage extends BasePayConfigStorage {
      * @see #getPid()
      */
     @Deprecated
-    @Override
     public String getPartner () {
         return merId;
     }