fix CONFLICT of education and communication

Author: pcqpcq

categories/communication.md

@@ -71,7 +71,7 @@ App Name                   | Describe                  | Major Language
 App Name                   | Describe                  | Major Language             | Download 
 :------------------------: | :------------------------ | :------------------------: | :------------------------: 
 [MaterialQQLite](https://github.com/wang4yu6peng13/MaterialQQLite) | A material style of QQ (based on MingQQ) | Java |  
-[messaging](https://github.com/Odoo-mobile/messaging) | Odoo Mobile Messaging Client. | Java |
+[messaging](https://github.com/Odoo-mobile/messaging) | Odoo Mobile Messaging Client. | Java |  
 [mogujie TeamTalk](https://github.com/mogutt/TTAndroidClient) | The android client of mogutt http://tt.mogu.io/ | Java | 
 
 ###N

categories/education.md

@@ -205,7 +205,7 @@ App Name                   | Describe                  | Major Language
 ###S
 App Name                   | Describe                  | Major Language             | Download 
 :------------------------: | :------------------------ | :------------------------: | :------------------------: 
-[Seashell-app](https://github.com/drakeet/Seashell-app) | 贝壳单词 APP Android 客户端 | Java | 
+[Seashell-app](https://github.com/drakeet/Seashell-app) | 贝壳单词 APP Android 客户端 | Java |    
 
 ###T
 App Name                   | Describe                  | Major Language             | Download 

categories/multi_media.md

@@ -11,6 +11,7 @@ App Name                   | Describe                  | Major Language
 [AnimeTaste](https://github.com/daimajia/AnimeTaste) | Taste global original animation | Java | 
 [AntennaPod](https://github.com/AntennaPod/AntennaPod) | A podcast manager for Android | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=de.danoeh.antennapod)   
 [Awkward Ratings](https://github.com/nasahapps/AwkwardRatings-Android) | Shows a list of movies which would be awkward to watch with parents. | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=com.nasahapps.awkwardratings)  
+["A Photo Manager" with "A Photo Map"](https://github.com/k3b/APhotoManager/) | Manage local photos on Android: gallery, geo map, find, sort, view, copy, delete, set gps exif data, send, ... . | Java | [<img src="https://f-droid.org/badge/get-it-on.png" alt="available on F-Droid app store" height="45">](https://f-droid.org/app/de.k3b.android.androFotoFinder)
 [Apollo](https://github.com/CyanogenMod/android_packages_apps_Apollo) | Highly customizable Android music app. | Java |
 [Auro](https://github.com/architjn/Auro) | 1st Most Fastest, Latest Designed and open source Music player | Java |  
 

categories/productivity.md

@@ -109,6 +109,7 @@ App Name                   | Describe                  | Major Language
 :------------------------: | :------------------------ | :------------------------: | :------------------------: 
 [Tasks](https://github.com/dmfs/opentasks) | A task app for Android | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=org.dmfs.tasks)  
 [Text Fairy](https://github.com/renard314/textfairy) | Android OCR App | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=com.renard.ocr)  
+[ToGoZip](https://github.com/k3b/ToGoZip/) | "Add To Zip" for android's share/send menu. | Java | [<img src="https://f-droid.org/badge/get-it-on.png" alt="available on F-Droid app store" height="45">](https://f-droid.org/app/de.k3b.android.toGoZip)
 [tudounotepad](https://github.com/geminiwen/tudounotepad) | A simple Notepad Application developed on Kotlin | Kotlin |  
 [Turbo Editor](https://github.com/vmihalachi/turbo-editor) | Simple, Powerful and Open Source Text Editor for Android | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=com.maskyn.fileeditor)
 [todotxt](https://github.com/ginatrapani/todo.txt-android) | Official Todo.txt Android app for managing your todo.txt file stored in Dropbox. http://todotxt.com | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=com.todotxt.todotxttouch)

categories/tools.md

@@ -29,6 +29,7 @@ App Name                   | Describe                  | Major Language
 [Camera Color Picker](https://github.com/tvbarthel/CameraColorPicker) | A simple tool that uses the device's camera to capture, in real time, colors around you. | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=fr.tvbarthel.apps.cameracolorpicker)
 [Clean Status Bar](https://github.com/emmaguy/clean-status-bar) | Tidy up your Android status bar before taking screenshots for the Play Store  | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=com.emmaguy.cleanstatusbar)  
 [Clip-Stack](https://github.com/heruoxin/Clip-Stack) | An Android clipboard history manager app with Material Design.  | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=com.catchingnow.tinyclipboardmanager)  
+[Content Provider Helper](https://github.com/k3b/ContentProviderHelper/) | Android app that helps developers to discover and query content providers.  | Java | [<img src="https://f-droid.org/badge/get-it-on.png" alt="available on F-Droid app store" height="45">](https://f-droid.org/app/de.k3b.android.contentproviderhelper)
 [Croma - Palette Manager](https://github.com/numixproject/org.numixproject.croma) | Android packaging for Croma http://croma.numixproject.org | Java |  
 [ConnectBot](https://github.com/connectbot/connectbot/) | The first SSH client for Android. | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=org.connectbot)
 
@@ -70,7 +71,7 @@ App Name                   | Describe                  | Major Language
 ###I
 App Name                   | Describe                  | Major Language             | Download 
 :------------------------: | :------------------------ | :------------------------: | :------------------------: 
-[Intent Intercept](https://github.com/intrications/intent-intercept) | This app attempts to intercept as many intents as possible in order to examine their contents. This helps when trying to develop an app that reacts to a particular intent.  | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=uk.co.ashtonbrsc.android.intentintercept)  
+[Intent Intercept](https://github.com/intrications/intent-intercept) | This app attempts to intercept as many intents as possible in order to examine their contents. This helps when trying to develop an app that reacts to a particular intent.  | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=uk.co.ashtonbrsc.android.intentintercept) [<img src="https://f-droid.org/badge/get-it-on.png" alt="available on F-Droid app store" height="45">](https://f-droid.org/app/uk.co.ashtonbrsc.android.intentintercept) 
 [Install Referrer](https://github.com/SimonMarquis/Android-InstallReferrer) | Test the referrer attribute on the Google Play Store | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=fr.simon.marquis.installreferrer)
 
 ###J
@@ -154,6 +155,7 @@ App Name                   | Describe                  | Major Language
 [Talalarmo Alarm Clock](https://github.com/trikita/talalarmo) | Android alarm clock  | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=trikita.talalarmo)  
 [Telecine](https://github.com/JakeWharton/Telecine) | Record full-resolution video on your Android devices. | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=com.jakewharton.telecine)  
 [Terminal Emulator for Android](https://github.com/jackpal/Android-Terminal-Emulator) | A VT-100 terminal emulator for the Android OS | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=jackpal.androidterm)  
+[ToGoZip](https://github.com/k3b/ToGoZip/) | "Add To Zip" for android's share/send menu. | Java | [<img src="https://f-droid.org/badge/get-it-on.png" alt="available on F-Droid app store" height="45">](https://f-droid.org/app/de.k3b.android.toGoZip)
 [ToolWizAppLock](https://github.com/Toolwiz/ToolWizAppLock) | Smart App Lock for Android http://www.toolwiz.com/ | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=com.cleanwiz.applock)  
 [TranslateApp](https://github.com/maoruibin/TranslateApp) | A translations app without interruptions  | Java | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=name.gudong.translate)  
 [translate-bubble-android](https://github.com/47deg/translate-bubble-android) | Translations without interruptions  | Scala | [![Get it on Google Play](http://i.imgur.com/7sq06lr.png)](https://play.google.com/store/apps/details?id=com.fortysevendeg.translatebubble)  

categories/travel_and_local.md

@@ -7,6 +7,7 @@ App Name                   | Describe                  | Major Language
 ###A
 App Name                   | Describe                  | Major Language             | Download 
 :------------------------: | :------------------------ | :------------------------: | :------------------------: 
+["A Photo Manager" with "A Photo Map"](https://github.com/k3b/APhotoManager/) | Geo Map to Manage local photos on Android: gallery, find, sort, view, copy, delete, set gps exif data, send, ... . | Java |  [<img src="https://f-droid.org/badge/get-it-on.png" alt="available on F-Droid app store" height="45">](https://f-droid.org/app/de.k3b.android.androFotoFinder)
  | | | 
 
 ###B