Correctly handle intercepted mutator calls from constructors of mapped
classes
Fix map/convert to String type
Merge branch 'upstream' of git://github.com/jmbreuer/modelmapper into jmbreuer-upstream

Conflicts:
	core/src/main/java/org/modelmapper/internal/ProxyFactory.java
Test for pull request 39