Bug fixes and added forced octet
Merge branch 'develop' of https://github.com/blingdahl/mifosx into imageresize

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