Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/app.module.ts

@@ -65,10 +65,14 @@ import { MediaCapture } from '@ionic-native/media-capture/ngx';
 import { Media } from '@ionic-native/media/ngx';
 import { StreamingMedia } from '@ionic-native/streaming-media/ngx';
 import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
+<<<<<<< HEAD
 import { CustomImageCachePageRoutingModule } from './services/file/custom-image-cache/custom-image-cache-routing.module';
 
 
 
+=======
+import {NgxImageCompressService} from 'ngx-image-compress';
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
 
 /* import { FCM } from '@ionic-native/fcm/ngx';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
@@ -140,7 +144,8 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
     MediaCapture,
     Media,
     StreamingMedia,
-    PhotoViewer
+    PhotoViewer,
+    NgxImageCompressService
   ],
   bootstrap: [AppComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]