diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..86337336
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided this notice is
+# preserved.  This file is offered as-is, without any warranty.
+# Names of contributors must not be used to endorse or promote products
+# derived from this file without specific prior written permission.
+
+# EditorConfig
+# http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# LF end-of-line, insert an empty new line and UTF-8
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
diff --git a/.gitignore b/.gitignore
index dcb90474..b3460d57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
+# Temp files
+*~
+*.bak
+*.backup
+\#*
+.\#*
+*\#
+*.swp
+*.swap
+*.sav
+*.save
+*.autosav
+*.autosave
+
 *.iml
 .gradle
 /local.properties
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2f4d102..930cb7d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -190,4 +190,3 @@ Version 1.0 *(2016-08-02)*
 ----------------------------
 
  * Initial release
-
diff --git a/LICENSE b/LICENSE
index ff97af7d..05ae1486 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/README.md b/README.md
index 87f08d14..685e1918 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ This app is just one piece of a bigger series of apps. You can find the rest of
 
 License
 -------
-    Copyright 2016 SimpleMobileTools
+    Copyright 2016-2017 SimpleMobileTools
     
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 82b92955..f86ec7a8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -3,34 +3,34 @@
     <string name="app_name">Gestionnaire de fichiers simple</string>
     <string name="app_launcher_name">Gestionnaire de fichiers</string>
     <string name="press_back_again">Appuyer à nouveau sur le bouton retour pour quitter</string>
-    <string name="no_app_found">No app for opening this type of file is available</string>
-    <string name="go_to_home_folder">Go to home folder</string>
-    <string name="set_as_home_folder">Set as home folder</string>
-    <string name="home_folder_updated">Home folder updated</string>
+    <string name="no_app_found">Aucune application pour ouvrir ce type de fichier n\'est installée</string>
+    <string name="go_to_home_folder">Aller au dossier par défaut</string>
+    <string name="set_as_home_folder">Définir en tant que dossier par défaut</string>
+    <string name="home_folder_updated">Dossier par défaut mis à jour</string>
 
     <!-- Compression -->
-    <string name="compress">Compress</string>
-    <string name="decompress">Decompress</string>
-    <string name="compress_as">Compress as</string>
-    <string name="compressing">Compressing…</string>
-    <string name="decompressing">Decompressing…</string>
-    <string name="compression_successful">Compression successful</string>
-    <string name="decompression_successful">Decompression successful</string>
-    <string name="compressing_failed">Compressing failed</string>
-    <string name="decompressing_failed">Decompressing failed</string>
+    <string name="compress">Compresser</string>
+    <string name="decompress">Décompresser</string>
+    <string name="compress_as">Compresser sous</string>
+    <string name="compressing">Compression…</string>
+    <string name="decompressing">Déompression…</string>
+    <string name="compression_successful">Compression réussie</string>
+    <string name="decompression_successful">Décompression réussie</string>
+    <string name="compressing_failed">Compression ratée</string>
+    <string name="decompressing_failed">Décompression ratée</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoris</string>
     <string name="add_to_favorites">Ajouter aux favoris</string>
     <string name="remove_from_favorites">Enlever des favoris</string>
-    <string name="manage_favorites">Manage favorites</string>
-    <string name="go_to_favorite">Go to favorite</string>
-    <string name="favorites_activity_placeholder">You can add frequently used folders to favorites for easy access from anywhere.</string>
+    <string name="manage_favorites">Gérer les favoris</string>
+    <string name="go_to_favorite">Aller au favori</string>
+    <string name="favorites_activity_placeholder">Vous pouvez ajouter des dossiers souvent utilisés comme favoris pour y avoir accès rapidement depuis n\'importe où.</string>
 
     <!-- Settings -->
-    <string name="enable_root_access">Enable root access</string>
+    <string name="enable_root_access">Activer les droits root</string>
 
-    <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
+    <!-- Strings displayed only on Google Play Store. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
     <string name="app_short_description">Un gestionnaire de fichiers simple pour naviguer et éditer ses fichiers et dossiers.</string>
     <string name="app_long_description">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5cf09d69..c9f47bb4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="app_name">Simple File Manager</string>
     <string name="app_launcher_name">File Manager</string>
     <string name="press_back_again">Press back again to exit</string>
-    <string name="no_app_found">No app for opening this type of file is available</string>
+    <string name="no_app_found">No app for opening this type of file is installed</string>
     <string name="go_to_home_folder">Go to home folder</string>
     <string name="set_as_home_folder">Set as home folder</string>
     <string name="home_folder_updated">Home folder updated</string>
@@ -30,7 +30,7 @@
     <!-- Settings -->
     <string name="enable_root_access">Enable root access</string>
 
-    <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
+    <!-- Strings displayed only on Google Play Store. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
     <string name="app_short_description">A simple file manager for browsing and editing files and directories.</string>
     <string name="app_long_description">