adad
merged
Merge branch 'master' of https://github.com/andreban/JMapper

Conflicts:
	.idea/workspace.xml