Merge branch 'master' into dev

diff --cc wp-fdroid/wp-fdroid.php
index 935b4dcc50f2a540bf9de4d27319162b2e2dc898,52ffb212a97780d2e1a2662c341b2ff58ace29b2..385e90c8c83b57df344edac22b44460d64d689e3
--- 1/wp-fdroid/wp-fdroid.php
--- 2/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@@ -102,10 -102,12 +102,13 @@@ class FDroi
  
  
        function get_app($query_vars) {
-               $permissions_object = new AndroidPermissions($this->site_path.'/repo/AndroidManifest.xml', $this->site_path.'/repo/strings.xml', $this->site_path.'/repo/android-permissions.cache');
+               global $permissions_data;
+               $permissions_object = new AndroidPermissions($this->site_path.'/wp-content/plugins/wp-fdroid/AndroidManifest.xml',
+                       $this->site_path.'/wp-content/plugins/wp-fdroid/strings.xml',
+                       sys_get_temp_dir().'/android-permissions.cache');
                $permissions_data = $permissions_object->get_permissions_array();
  
 +              // Get app data
                $xml = simplexml_load_file($this->site_path.'/repo/index.xml');
                foreach($xml->children() as $app) {