Merge branch 'fronkdev' into 'master'

Fixed ADBHausnummer::count() with joins sql

See merge request fronk/thetool!1460

application/ADBHausnummer/ADBHausnummerModel.php

@@ -142,6 +142,9 @@ class ADBHausnummerModel {
             $sql .= " GROUP BY Hausnummer.id";
         }
 
+        if($join_tables) {
+            $sql .= ") count_table";
+        }
 
 
         mfLoghandler::singleton()->debug($sql);