Fix a bunch of bugs

sugar/p2p/Group.py

@@ -2,7 +2,7 @@ from Buddy import Buddy
 from Buddy import Owner
 from Buddy import PRESENCE_SERVICE_TYPE
 from Service import Service
-import Model
+from sugar.p2p.model.Store import Store
 import presence
 
 class Group:
@@ -15,7 +15,7 @@ class Group:
 	def __init__(self):
 		self._service_listeners = []
 		self._presence_listeners = []
-		self._store = Model.Store(self)
+		self._store = Store(self)
 	
 	def get_store(self):
 		return self._store

sugar/p2p/model/LocalModel.py

@@ -2,7 +2,7 @@ import socket
 
 from sugar.p2p.Service import Service
 from sugar.p2p.model.AbstractModel import AbstractModel
-import network
+from sugar.p2p import network
 
 class ModelRequestHandler(object):
 	def __init__(self, model):
@@ -25,7 +25,6 @@ class LocalModel(AbstractModel):
 		self._values = {}
 		
 		self._setup_service()
-		self._setup_notification()
 	
 	def get_value(self, key):
 		return self._values[key]