Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/www-myfit into myfit-import-image-faq-review

# Conflicts:
#	src/assets/images/download-screen01.png
#	src/assets/images/download-screen02.png
#	src/component/Pages/Faq/Main.js
#	src/component/Pages/Review/Main.js

src/component/Pages/Faq/Main.js

@@ -10,6 +10,7 @@ import Faq from '../../HomeMain/Faq/Main'
 import screen from '../../../assets/images/download-screen01.png'
 import screen1 from '../../../assets/images/download-screen02.png'
 
+
 import SiteService from '../../../vendors/service/siteService'
 
 const Main = ({brdcum}) => {
@@ -244,18 +245,16 @@ const Main = ({brdcum}) => {
                             </div>
                         </div>
                         <div className="col-md-6">
-                            {/* <div className="free_img">
-                                <img src="assets/images/download-screen01.png" alt="image" />
-                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
-                            </div> */}
                             <div className="free_img">
                                 <img src={screen} alt="image" />
                                 <img className="mobile_mockup" src={screen1} alt="image" />
+                                {/* <img src="assets/images/download-screen01.png" alt="image" />
+                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" /> */}
                             </div>
-                        </div>
                     </div>
                 </div>
             </div>
+            </div>
         </section>
     </>
   )

src/component/Pages/Review/Main.js

@@ -4,6 +4,8 @@ import Bredcrumb from '../../Bredcrumb/Main'
 import BGImg from "../../../assets/images/bread_crumb_bg.png"
 import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png"
 import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png"
+import blueapp from "../../../assets/images/appstore_blue.png"
+import blue from "../../../assets/images/googleplay_blue.png"
 import screen from '../../../assets/images/download-screen01.png'
 import screen1 from '../../../assets/images/download-screen02.png'
 
@@ -345,14 +347,12 @@ const Main = ({brdcum}) => {
                             </div>
                         </div>
                         <div className="col-md-6">
-                            {/* <div className="free_img">
-                                <img src="assets/images/download-screen01.png" alt="image" />
-                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
-                            </div> */}
                             <div className="free_img">
                                 <img src={screen} alt="image" />
                                 <img className="mobile_mockup" src={screen1} alt="image" />
-                            </div>
+                                {/* <img src="assets/images/download-screen01.png" alt="image" />
+                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" /> */}
+                           </div>
                         </div>
                     </div>
                 </div>

src/component/Pricing/Main.js

@@ -8,6 +8,8 @@ import BGImg1 from "../../assets/images/bread_crumb_bg_one.png"
 import BGImg2 from "../../assets/images/bread_crumb_bg_two.png"
 import blueapp from "../../assets/images/appstore_blue.png";
 import blue from "../../assets/images/googleplay_blue.png";
+import screen from '../../assets/images/download-screen01.png';
+import screen1 from '../../assets/images/download-screen02.png';
 
 
 const Main = ({brdcum}) => {
@@ -230,8 +232,10 @@ const Main = ({brdcum}) => {
                         </div>
                         <div className="col-md-6">
                             <div className="free_img">
-                                <img src="assets/images/download-screen01.png" alt="image" />
-                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
+                                <img src={screen} alt="image" />
+                                <img className="mobile_mockup" src={screen1} alt="image" />
+                                {/* <img src="assets/images/download-screen01.png" alt="image" />
+                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" /> */}
                             </div>
                         </div>
                     </div>