fixed conflicts with master

diff --cc controller.py
index 0061007,efa8ecd..9397daf
--- 1/controller.py
--- 2/controller.py
+++ b/controller.py
@@@ -64,15 -59,15 +64,15 @@@ class MeabookController
          return [(name, internal_name, 'd') for name, internal_name in \
              self.model.get_folders()]
  
-     def get_all_files(self):
-         """Gets all peoples."""
+     #def get_all_files(self):
+     #    """Gets all peoples."""
  
-         # FIXME: read field names from Config
-         files_dict = self.model.get_files(['cn'])
-         return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \
-             for internal_name in files_dict]
+     #    # FIXME: read field names from Config
+     #    files_dict = self.model.get_files(['cn'])
+     #    return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \
+     #        for internal_name in files_dict]
  
 -    def get_all_files_by_pattern(self, pattern, separated=False):
 +    def get_files_by_pattern(self, pattern, separated=False):
          """Gets all peoples matched pattern."""
  
          if not separated:

diff --cc database/SQLite.py
Simple merge