Merge branch 'develop' of https://github.com/blingdahl/mifosx into imageresize

Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/data/ImageData.java
Merge commit 'b0877535386fc58d3c1c9c7565d7ee500d1f1f72' into imageresize

Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/data/ImageData.java
Fixed scaled image aspect ratio
Merge pull request #2 from ttfkam/develop

And hopefully non-square images