Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
#	src/main/ui/static/payment/partner/partner.js

src/main/ui/static/payment/partner/partner.js

@@ -85,7 +85,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
         $scope.partner.sameAsAddress = false;
 
         $scope.partner.partner_type = $scope.partner.company_website ? 'website' : 'photo';
-        if ($scope.partner.representativeInfo.phone) {
+        if ($scope.partner.representativeInfo && $scope.partner.representativeInfo.phone) {
             $scope.partner.representativeInfo.phone = $scope.partner.representativeInfo.phone.substring(1, $scope.partner.contact_phone.length);
         }
         $scope.getMerchantLocation = function () {