Reverted some silly changes...
MultiImagePatchDataLayer implementation, formatting and test