Merge branch 'master' into copy-method-2

Conflicts:
	src/main/java/net/karneim/pojobuilder/BuilderModelProducer.java
	src/main/java/net/karneim/pojobuilder/model/BuilderM.java
	src/main/templates/Builder-template.stg