Merge branch 'refactoring_2016' into 'master'

bob.db.base.File does not accept client_id

See merge request !3

bob/db/banca/models.py

@@ -109,7 +109,8 @@ class File(Base, bob.db.base.File):
 
   def __init__(self, client_id, path, claimed_id, shot_id, session_id):
     # call base class constructor
-    bob.db.base.File.__init__(self, client_id = client_id, path = path)
+    bob.db.base.File.__init__(self, path = path)
+    self.client_id = client_id
 
     self.claimed_id = claimed_id
     self.shot_id = shot_id