Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Base.java
	src/PaymentwallProductBuilder.java
	src/Pingback.java