Merge marwensdiri/master

Conflicts:
	nbproject/project.properties
	src/com/tunisianwatch/Dao/UtilisateurDao.java
Merge marwensdiri/master

Conflicts:
	nbproject/project.properties
	src/com/tunisianwatch/Dao/UtilisateurDao.java
Merge marwensdiri/master

Conflicts:
	nbproject/project.properties
	src/com/tunisianwatch/Dao/UtilisateurDao.java
Merge marwensdiri/master

Conflicts:
	nbproject/project.properties
	src/com/tunisianwatch/Dao/UtilisateurDao.java
Merge marwensdiri/master