Do not resize images when not required
Autocommit selectively
Merge branch 'beta3' into version4

Conflicts:
	server/src/main/java/org/activityinfo/service/blob/GcsBlobFieldStorageService.java