merge
Merge origin/master

Conflicts:
	src/java/com/objet/BDDContact.java