Merge branch 'ae_bug_fix' into 'master'

Fixed a bug in the ConvAutoencoder

See merge request !11

bob/learn/pytorch/architectures/ConvAutoencoder.py

@@ -57,10 +57,11 @@ class ConvAutoencoder(nn.Module):
         The forward method.
         """
         x = self.encoder(x)
-        x = self.decoder(x)
 
         if self.return_latent_embedding:
-            return self.encoder(x)
+            return x
+
+        x = self.decoder(x)
 
         return x