Signed-off-by: Amira <Amira@172.16.96.234>
Merge branch 'master' of
ssh://git@github.com/medalibettaieb/2013_4Cinfo1.git

Conflicts:
	tn.edu.espritCs.info1.watcher/build/classes/META-INF/persistence.xml
	tn.edu.espritCs.info1.watcher/ejbModule/META-INF/persistence.xml
JunitTests

Signed-off-by: Amira <Amira@Amira-PC>