diff --git a/.DS_Store b/.DS_Store
index 2bf5077a..e69afe43 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/App/android/app/build.gradle b/App/android/app/build.gradle
index fac4a68f..07d87ff7 100755
--- a/App/android/app/build.gradle
+++ b/App/android/app/build.gradle
@@ -149,7 +149,7 @@ android {
 }
 
 dependencies {
-    compile project(':react-native-image-picker')
+
     compile project(':react-native-maps')
     compile project(':react-native-device-info')
     compile project(':react-native-material-shadows')
diff --git a/App/android/app/src/main/java/com/app/MainApplication.java b/App/android/app/src/main/java/com/app/MainApplication.java
index 7224c546..326eac1c 100755
--- a/App/android/app/src/main/java/com/app/MainApplication.java
+++ b/App/android/app/src/main/java/com/app/MainApplication.java
@@ -3,7 +3,7 @@ package com.app;
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
-import com.imagepicker.ImagePickerPackage;
+
 import com.airbnb.android.react.maps.MapsPackage;
 import com.learnium.RNDeviceInfo.RNDeviceInfo;
 import ui.materialshadows.RNMaterialShadowsPackage;
@@ -31,7 +31,7 @@ public class MainApplication extends Application implements ReactApplication {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
-            new ImagePickerPackage(),
+          
             new MapsPackage(),
             new RNDeviceInfo(),
             new RNMaterialShadowsPackage(),
diff --git a/App/android/settings.gradle b/App/android/settings.gradle
index e5be8414..bf47bc13 100755
--- a/App/android/settings.gradle
+++ b/App/android/settings.gradle
@@ -1,6 +1,5 @@
 rootProject.name = 'app'
-include ':react-native-image-picker'
-project(':react-native-image-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-picker/android')
+
 include ':react-native-maps'
 project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android')
 include ':react-native-device-info'
diff --git a/App/app/screens/Profile.js b/App/app/screens/Profile.js
index 3e250a6b..aa9a9c30 100644
--- a/App/app/screens/Profile.js
+++ b/App/app/screens/Profile.js
@@ -35,7 +35,7 @@ import Tel from "../components/Telephone";
 const SCREEN_HEIGHT = Dimensions.get("window").height;
 const SCREEN_WIDTH = Dimensions.get("window").width;
 import Icon from "react-native-vector-icons/Ionicons";
-import ImagePicker from "react-native-image-picker";
+
 
 var options = {
   title: "Selecionar foto de perfil",
@@ -191,28 +191,7 @@ class Profile extends Component {
       });
     } else console.log("data not valid");
   }
-  _open = () => {
-    ImagePicker.showImagePicker(options, response => {
-      console.log("Response = ", response);
-
-      if (response.didCancel) {
-        console.log("User cancelled image picker");
-      } else if (response.error) {
-        console.log("ImagePicker Error: ", response.error);
-      } else if (response.customButton) {
-        console.log("User tapped custom button: ", response.customButton);
-      } else {
-        const source = { uri: response.uri };
-
-        // You can also display the image using data:
-        // const source = { uri: 'data:image/jpeg;base64,' + response.data };
-
-        this.setState({
-          avatarSource: source
-        });
-      }
-    });
-  };
+ 
 
   render() {
     if (this.props.onHold) {
diff --git a/App/app/screens/calendarDetail.js b/App/app/screens/calendarDetail.js
index e791b97e..c90f9ac6 100644
--- a/App/app/screens/calendarDetail.js
+++ b/App/app/screens/calendarDetail.js
@@ -11,7 +11,9 @@ import {
   ImageBackground,
   ListView,
   FlatList,
-  ActivityIndicator
+  ActivityIndicator,
+  Linking,
+  Platform
 } from "react-native";
 
 import moment from "moment";
@@ -51,7 +53,7 @@ class calendarDetail extends React.Component {
     header: (
       <NavAbsolute
         navigation={navigation}
-        // title={navigation.state.params.info.name}
+      // title={navigation.state.params.info.name}
       />
     )
   });
@@ -82,30 +84,30 @@ class calendarDetail extends React.Component {
     const { navigation } = this.props;
     const info = navigation.getParam("info", "error");
 
-    if(this.props.sessionDetail==undefined){
-      return(<View style={{flex:1, alignSelf:'center',margin:SCREEN_HEIGHT*0.45}}>
- <ActivityIndicator size="large" color="#CC1A17" />
+    if (this.props.sessionDetail == undefined) {
+      return (<View style={{ flex: 1, alignSelf: 'center', margin: SCREEN_HEIGHT * 0.45 }}>
+        <ActivityIndicator size="large" color="#CC1A17" />
       </View>
-       
+
       )
     }
 
     return (
-      info!=undefined &&
+      info != undefined &&
       <View style={styles.mainViewStyle}>
         <ScrollView style={styles.scroll}>
           <View style={styles.container}>
             <View style={styles.headerContainer}>
-            <View style={styles.headerContainer}>
-        <View style={styles.coverContainer}>
-          <ImageBackground
-            source={{
-              uri: `https://tickets.enei.pt/adminpoint/Content/Images/Uploads/Sessions/${this.props.sessionDetail.Image}`
-            }}
-            style={styles.coverImage}
-          />
-        </View>
-      </View>
+              <View style={styles.headerContainer}>
+                <View style={styles.coverContainer}>
+                  <ImageBackground
+                    source={{
+                      uri: `https://tickets.enei.pt/adminpoint/Content/Images/Uploads/Sessions/${this.props.sessionDetail.Image}`
+                    }}
+                    style={styles.coverImage}
+                  />
+                </View>
+              </View>
             </View>
             <View>
               <View style={styles.header}>
@@ -134,18 +136,18 @@ class calendarDetail extends React.Component {
                   >
                     {this.props.sessionDetail.Name}
                   </Text>
-                  
+
                 </View>
 
                 <View style={{ margin: 10 }}>
-                    {this.props.sessionDetail.Enrolled!= 0 && this.props.sessionDetail.MaxAttendees!=0 &&
-                  <Progress.Bar
-                    color={"#000000"}
-                    progress={this.props.sessionDetail.Enrolled / this.props.sessionDetail.MaxAttendees}
-                    height={10}
-                    unfilledColor={"white"}
-                    width={210}
-                  />}
+                  {this.props.sessionDetail.Enrolled != 0 && this.props.sessionDetail.MaxAttendees != 0 &&
+                    <Progress.Bar
+                      color={"#000000"}
+                      progress={this.props.sessionDetail.Enrolled / this.props.sessionDetail.MaxAttendees}
+                      height={10}
+                      unfilledColor={"white"}
+                      width={210}
+                    />}
                   <Text>
                     {this.props.sessionDetail.Enrolled} / {this.props.sessionDetail.MaxAttendees}
                   </Text>
@@ -226,15 +228,38 @@ class calendarDetail extends React.Component {
               </View>
             </View>
           </View>
-          <View style={styles.block}>
-            <Text
-              style={{ fontSize: 15, color: "#CC1A17", fontWeight: "bold" }}
-            >
-              Localização
+          {
+            this.props.sessionDetail.LocalRoom != undefined && this.props.sessionDetail.LocalCoordinates != undefined &&
+
+            <View style={styles.block}>
+              <Text
+                style={{ fontSize: 15, color: "#CC1A17", fontWeight: "bold" }}
+              >
+                Localização
             </Text>
-            <Divider style={{ backgroundColor: "#000", marginBottom: 10 }} />
-           <Text>Em breve</Text>
-          </View>
+              <Divider style={{ backgroundColor: "#000", marginBottom: 10 }} />
+              <Text style={{marginBottom:20}}>{this.props.sessionDetail.LocalRoom}</Text>
+              <Button
+                 onPress={() => {
+                  
+                const scheme = Platform.select({
+                  ios: "maps:0,0?q=",
+                  android: "geo:0,0?q="
+                });
+                const latLng = this.props.sessionDetail.LocalCoordinates;
+                const label = this.props.sessionDetail.LocalRoom;
+                const url = Platform.select({
+                  ios: `${scheme}${label}@${latLng}`,
+                  android: `${scheme}${latLng}(${label})`
+                });
+
+                Linking.openURL(url);
+              }}
+                  title={"Abrir no Mapa"}
+                  color={"#CC1A17"}
+                />
+            </View>
+          }
         </ScrollView>
         <Divider style={{ backgroundColor: "black" }} />
       </View>
diff --git a/App/ios/app.xcodeproj/project.pbxproj b/App/ios/app.xcodeproj/project.pbxproj
index 75ae538d..039a4d36 100755
--- a/App/ios/app.xcodeproj/project.pbxproj
+++ b/App/ios/app.xcodeproj/project.pbxproj
@@ -36,12 +36,10 @@
 		2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
 		2DCD954D1E0B4F2C00145EB5 /* appTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* appTests.m */; };
 		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
-		36323C84F40A4AD98ED24867 /* libRNNetworkInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F17AA23BABD64924A34416D0 /* libRNNetworkInfo.a */; };
 		4EBB88037B054A508BF35245 /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F42241E0235464C91B24049 /* libRNDeviceInfo.a */; };
 		514DB1DF2E3B452F9EF272E3 /* libRNVectorIcons-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 95B0A42B6CD8441E904E6EB9 /* libRNVectorIcons-tvOS.a */; };
 		69E1B84AE0DF486CB1B1D226 /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C00CE8A4E3B747F9816B91CF /* libBVLinearGradient.a */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
-		95BB560D0FBE4259815182B3 /* libimageCropPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DFE0E611CE9446B8B39E61E /* libimageCropPicker.a */; };
 		A52E07192CD249F7B10FDA66 /* libAirMaps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C0906CC582484A7393F9B1F6 /* libAirMaps.a */; };
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
 		BE104176D74E47E9A369B15A /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB0A5A258CBE4EEFAD3C358E /* libRNVectorIcons.a */; };
@@ -63,7 +61,6 @@
 		BE5EAB86221B7D5400E92E5B /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB77221B7D5400E92E5B /* Zocial.ttf */; };
 		BE5EAC3A221B83CF00E92E5B /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE302B75221B7C3B005626CF /* Ionicons.ttf */; };
 		BE5EAC41221B889900E92E5B /* libReactNativePermissions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE5EAC40221B888C00E92E5B /* libReactNativePermissions.a */; };
-		C4424512325C419A8C59B9B1 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 75426ED753E94FDF955E27D9 /* libRNImagePicker.a */; };
 		E677346A94D54E90817979B0 /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C4D43A092A4408B91B32E76 /* libRNDeviceInfo-tvOS.a */; };
 /* End PBXBuildFile section */
 
@@ -341,27 +338,6 @@
 			remoteGlobalIDString = 358F4ED71D1E81A9004DF814;
 			remoteInfo = RCTBlob;
 		};
-		B531CE5B224BE135002E8E5F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 560B0A0D61754DCFA99F6FFB /* imageCropPicker.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3400A8081CEB54A6008A0BC7;
-			remoteInfo = imageCropPicker;
-		};
-		B531CE5E224BE135002E8E5F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = ED5C7473CD764393A9F1944C /* RNImagePicker.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 014A3B5C1C6CF33500B6D375;
-			remoteInfo = RNImagePicker;
-		};
-		B531CE61224BE135002E8E5F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 293AF9FDDC2442BDBF3C2FE0 /* RNNetworkInfo.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 045BEB3C1B52EA6A0013C1B9;
-			remoteInfo = RNNetworkInfo;
-		};
 		BE302B6B221B7860005626CF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BE302B67221B7860005626CF /* RNCamera.xcodeproj */;
@@ -456,17 +432,13 @@
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = app/main.m; sourceTree = "<group>"; };
 		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
 		1908F5E093844AC5A143E888 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; };
-		293AF9FDDC2442BDBF3C2FE0 /* RNNetworkInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNNetworkInfo.xcodeproj; path = "../node_modules/react-native-network-info/ios/RNNetworkInfo.xcodeproj"; sourceTree = "<group>"; };
 		2D02E47B1E0B4A5D006451C7 /* app-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "app-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D02E4901E0B4A5D006451C7 /* app-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "app-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3C4D43A092A4408B91B32E76 /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; };
-		560B0A0D61754DCFA99F6FFB /* imageCropPicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = imageCropPicker.xcodeproj; path = "../node_modules/react-native-image-crop-picker/ios/imageCropPicker.xcodeproj"; sourceTree = "<group>"; };
 		5BA133418E6F4967BC5BC234 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/ios/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; };
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
 		664970B9D10A41A18B44727F /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
-		6DFE0E611CE9446B8B39E61E /* libimageCropPicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libimageCropPicker.a; sourceTree = "<group>"; };
-		75426ED753E94FDF955E27D9 /* libRNImagePicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNImagePicker.a; sourceTree = "<group>"; };
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
 		95B0A42B6CD8441E904E6EB9 /* libRNVectorIcons-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNVectorIcons-tvOS.a"; sourceTree = "<group>"; };
@@ -493,8 +465,6 @@
 		C00CE8A4E3B747F9816B91CF /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBVLinearGradient.a; sourceTree = "<group>"; };
 		C0906CC582484A7393F9B1F6 /* libAirMaps.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libAirMaps.a; sourceTree = "<group>"; };
 		EB0A5A258CBE4EEFAD3C358E /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
-		ED5C7473CD764393A9F1944C /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../node_modules/react-native-image-picker-m/ios/RNImagePicker.xcodeproj"; sourceTree = "<group>"; };
-		F17AA23BABD64924A34416D0 /* libRNNetworkInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNNetworkInfo.a; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -529,9 +499,6 @@
 				69E1B84AE0DF486CB1B1D226 /* libBVLinearGradient.a in Frameworks */,
 				4EBB88037B054A508BF35245 /* libRNDeviceInfo.a in Frameworks */,
 				A52E07192CD249F7B10FDA66 /* libAirMaps.a in Frameworks */,
-				95BB560D0FBE4259815182B3 /* libimageCropPicker.a in Frameworks */,
-				C4424512325C419A8C59B9B1 /* libRNImagePicker.a in Frameworks */,
-				36323C84F40A4AD98ED24867 /* libRNNetworkInfo.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -727,9 +694,6 @@
 				1908F5E093844AC5A143E888 /* BVLinearGradient.xcodeproj */,
 				5BA133418E6F4967BC5BC234 /* RNDeviceInfo.xcodeproj */,
 				A97F1617782E42EC83467F41 /* AirMaps.xcodeproj */,
-				560B0A0D61754DCFA99F6FFB /* imageCropPicker.xcodeproj */,
-				ED5C7473CD764393A9F1944C /* RNImagePicker.xcodeproj */,
-				293AF9FDDC2442BDBF3C2FE0 /* RNNetworkInfo.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -779,30 +743,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		B531CE54224BE134002E8E5F /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B531CE5C224BE135002E8E5F /* libimageCropPicker.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		B531CE56224BE134002E8E5F /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B531CE62224BE135002E8E5F /* libRNNetworkInfo.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		B531CE58224BE134002E8E5F /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B531CE5F224BE135002E8E5F /* libRNImagePicker.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		BE302B68221B7860005626CF /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -850,9 +790,6 @@
 				0F42241E0235464C91B24049 /* libRNDeviceInfo.a */,
 				C0906CC582484A7393F9B1F6 /* libAirMaps.a */,
 				3C4D43A092A4408B91B32E76 /* libRNDeviceInfo-tvOS.a */,
-				6DFE0E611CE9446B8B39E61E /* libimageCropPicker.a */,
-				75426ED753E94FDF955E27D9 /* libRNImagePicker.a */,
-				F17AA23BABD64924A34416D0 /* libRNNetworkInfo.a */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
@@ -1025,10 +962,6 @@
 					ProductGroup = BE5EAC32221B835A00E92E5B /* Products */;
 					ProjectRef = 1908F5E093844AC5A143E888 /* BVLinearGradient.xcodeproj */;
 				},
-				{
-					ProductGroup = B531CE54224BE134002E8E5F /* Products */;
-					ProjectRef = 560B0A0D61754DCFA99F6FFB /* imageCropPicker.xcodeproj */;
-				},
 				{
 					ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
 					ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@@ -1093,14 +1026,6 @@
 					ProductGroup = BE302B6F221B7AC7005626CF /* Products */;
 					ProjectRef = BE302B6E221B7AC7005626CF /* RNGestureHandler.xcodeproj */;
 				},
-				{
-					ProductGroup = B531CE58224BE134002E8E5F /* Products */;
-					ProjectRef = ED5C7473CD764393A9F1944C /* RNImagePicker.xcodeproj */;
-				},
-				{
-					ProductGroup = B531CE56224BE134002E8E5F /* Products */;
-					ProjectRef = 293AF9FDDC2442BDBF3C2FE0 /* RNNetworkInfo.xcodeproj */;
-				},
 				{
 					ProductGroup = BE5EABF2221B834400E92E5B /* Products */;
 					ProjectRef = 664970B9D10A41A18B44727F /* RNVectorIcons.xcodeproj */;
@@ -1376,27 +1301,6 @@
 			remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		B531CE5C224BE135002E8E5F /* libimageCropPicker.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libimageCropPicker.a;
-			remoteRef = B531CE5B224BE135002E8E5F /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		B531CE5F224BE135002E8E5F /* libRNImagePicker.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRNImagePicker.a;
-			remoteRef = B531CE5E224BE135002E8E5F /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		B531CE62224BE135002E8E5F /* libRNNetworkInfo.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRNNetworkInfo.a;
-			remoteRef = B531CE61224BE135002E8E5F /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		BE302B6C221B7860005626CF /* libRNCamera.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1627,9 +1531,6 @@
 					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
 					"$(SRCROOT)..\node_modules\neact-native-mapslibios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-crop-picker/ios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-picker-m/ios",
-					"$(SRCROOT)/../node_modules/react-native-network-info/ios",
 				);
 				INFOPLIST_FILE = appTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -1642,9 +1543,6 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1668,9 +1566,6 @@
 					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
 					"$(SRCROOT)..\node_modules\neact-native-mapslibios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-crop-picker/ios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-picker-m/ios",
-					"$(SRCROOT)/../node_modules/react-native-network-info/ios",
 				);
 				INFOPLIST_FILE = appTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -1683,9 +1578,6 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1710,9 +1602,6 @@
 					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
 					"$(SRCROOT)..\node_modules\neact-native-mapslibios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-crop-picker/ios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-picker-m/ios",
-					"$(SRCROOT)/../node_modules/react-native-network-info/ios",
 				);
 				INFOPLIST_FILE = app/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1739,9 +1628,6 @@
 					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
 					"$(SRCROOT)..\node_modules\neact-native-mapslibios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-crop-picker/ios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-picker-m/ios",
-					"$(SRCROOT)/../node_modules/react-native-network-info/ios",
 				);
 				INFOPLIST_FILE = app/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1775,9 +1661,6 @@
 					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
 					"$(SRCROOT)..\node_modules\neact-native-mapslibios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-crop-picker/ios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-picker-m/ios",
-					"$(SRCROOT)/../node_modules/react-native-network-info/ios",
 				);
 				INFOPLIST_FILE = "app-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1789,9 +1672,6 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1824,9 +1704,6 @@
 					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
 					"$(SRCROOT)..\node_modules\neact-native-mapslibios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-crop-picker/ios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-picker-m/ios",
-					"$(SRCROOT)/../node_modules/react-native-network-info/ios",
 				);
 				INFOPLIST_FILE = "app-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1838,9 +1715,6 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1871,9 +1745,6 @@
 					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
 					"$(SRCROOT)..\node_modules\neact-native-mapslibios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-crop-picker/ios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-picker-m/ios",
-					"$(SRCROOT)/../node_modules/react-native-network-info/ios",
 				);
 				INFOPLIST_FILE = "app-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1885,9 +1756,6 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1918,9 +1786,6 @@
 					"$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient",
 					"$(SRCROOT)/../node_modules/react-native-device-info/ios/RNDeviceInfo",
 					"$(SRCROOT)..\node_modules\neact-native-mapslibios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-crop-picker/ios/**",
-					"$(SRCROOT)/../node_modules/react-native-image-picker-m/ios",
-					"$(SRCROOT)/../node_modules/react-native-network-info/ios",
 				);
 				INFOPLIST_FILE = "app-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1932,9 +1797,6 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
diff --git a/App/ios/app.xcodeproj/xcshareddata/xcschemes/app.xcscheme b/App/ios/app.xcodeproj/xcshareddata/xcschemes/app.xcscheme
index 9e81ae51..a7dc6e28 100755
--- a/App/ios/app.xcodeproj/xcshareddata/xcschemes/app.xcscheme
+++ b/App/ios/app.xcodeproj/xcshareddata/xcschemes/app.xcscheme
@@ -51,9 +51,9 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -108,15 +108,16 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
-            BuildableName = "libReact.a"
-            BlueprintName = "React"
-            ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "app.app"
+            BlueprintName = "app"
+            ReferencedContainer = "container:app.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/App/ios/app/Info.plist b/App/ios/app/Info.plist
index 54f1c967..b86856d1 100755
--- a/App/ios/app/Info.plist
+++ b/App/ios/app/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>8</string>
+	<string>11</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
@@ -45,6 +45,8 @@
 	<string>Not used, just added this key because i used react-native and needed this keys for approval.</string>
 	<key>NSCameraUsageDescription</key>
 	<string>Not used, just added this key because i used react-native and needed this keys for approval.</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Not used, just added this key because i used react-native and needed this keys for approval.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Not used, just added this key because i used react-native and needed this keys for approval.</string>
 	<key>NSMicrophoneUsageDescription</key>
diff --git a/App/package-lock.json b/App/package-lock.json
index 76af04af..71670fb7 100755
--- a/App/package-lock.json
+++ b/App/package-lock.json
@@ -7961,11 +7961,7 @@
         }
       }
     },
-    "react-native-image-crop-picker": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/react-native-image-crop-picker/-/react-native-image-crop-picker-0.23.0.tgz",
-      "integrity": "sha512-BmfP246feY+sElYArAR7/DGRT2kFCTvAdiBKcIH8sA7UbUNy2eGAZsXBZWtt917wm+RuhW98CoAsnKB3iH9IvQ=="
-    },
+  
     "react-native-image-overlay": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/react-native-image-overlay/-/react-native-image-overlay-0.1.2.tgz",
@@ -7974,16 +7970,7 @@
         "prop-types": "^15.6.1"
       }
     },
-    "react-native-image-picker": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/react-native-image-picker/-/react-native-image-picker-0.28.0.tgz",
-      "integrity": "sha512-lQfdOyC1mQ/pvfEaUGdoodO1A1clg9kf6YC1WdbWhA6XK+joBd9GQYf8SaCf6/7vM25U4ib+6ux4yvnrS1pOqQ=="
-    },
-    "react-native-image-picker-m": {
-      "version": "0.26.8",
-      "resolved": "https://registry.npmjs.org/react-native-image-picker-m/-/react-native-image-picker-m-0.26.8.tgz",
-      "integrity": "sha512-I9kcz7EL79KfmC+nAiEM5qzC14pj4AqrpqToXp008D0WSwpvzb2XFtwuZQChioK+HT6qkple50Jj8AYskJFIQg=="
-    },
+  
     "react-native-ionicons": {
       "version": "4.5.5",
       "resolved": "https://registry.npmjs.org/react-native-ionicons/-/react-native-ionicons-4.5.5.tgz",
diff --git a/App/package.json b/App/package.json
index d62d779f..2b3ed8bd 100755
--- a/App/package.json
+++ b/App/package.json
@@ -27,10 +27,9 @@
     "react-native-elements": "^1.0.0",
     "react-native-fit-image": "^1.5.4",
     "react-native-gesture-handler": "^1.0.15",
-    "react-native-image-crop-picker": "^0.23.0",
+ 
     "react-native-image-overlay": "^0.1.2",
-    "react-native-image-picker": "^0.28.0",
-    "react-native-image-picker-m": "^0.26.8",
+
     "react-native-ionicons": "^4.5.5",
     "react-native-linear-gradient": "^2.5.3",
     "react-native-loader": "^1.2.1",
diff --git a/App/yarn.lock b/App/yarn.lock
index 296b6a96..8bc0b89b 100644
--- a/App/yarn.lock
+++ b/App/yarn.lock
@@ -5596,15 +5596,6 @@ react-native-image-overlay@^0.1.2:
   dependencies:
     prop-types "^15.6.1"
 
-react-native-image-picker-m@^0.26.8:
-  version "0.26.8"
-  resolved "https://registry.yarnpkg.com/react-native-image-picker-m/-/react-native-image-picker-m-0.26.8.tgz#ff08bbb4f99f5c1cbb3fa2e2bb7a25ac3565331b"
-  integrity sha512-I9kcz7EL79KfmC+nAiEM5qzC14pj4AqrpqToXp008D0WSwpvzb2XFtwuZQChioK+HT6qkple50Jj8AYskJFIQg==
-
-react-native-image-picker@^0.28.0:
-  version "0.28.0"
-  resolved "https://registry.yarnpkg.com/react-native-image-picker/-/react-native-image-picker-0.28.0.tgz#e3f26df170ea932e9c0404624fbced2f59a300e3"
-  integrity sha512-lQfdOyC1mQ/pvfEaUGdoodO1A1clg9kf6YC1WdbWhA6XK+joBd9GQYf8SaCf6/7vM25U4ib+6ux4yvnrS1pOqQ==
 
 react-native-ionicons@^4.5.5:
   version "4.5.5"