Merge branch 'develop' of https://github.com/ttfkam/mifosx into ttfkam-develop

Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/data/ImageData.java

Merge in Miles' changes
Merge branch 'ttfkam-develop' into develop
Merge commit 'b0877535386fc58d3c1c9c7565d7ee500d1f1f72' into imageresize

Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/data/ImageData.java