Problem solved
Merge branch 'master' of https://github.com:443/mehduz/JavaBDD.git

Conflicts:
	JavaBDD/src/dal/DAOFactory.java
	JavaBDD/src/gui/Client.java
Merge branch 'master' of https://github.com:443/mehduz/JavaBDD.git