merge from origin master.
merge from origin:master.
Merge branch 'master' of https://bitbucket.org/McGivrer/contacts

Conflicts:
	.classpath
	assemble/assembly.xml
	db/contacts.log
	db/contacts.properties
	db/contacts.script
	db/test-contacts.properties
	src/main/webapp/WEB-INF/web.xml

Signed-off-by: Frédéric Delorme <frederic.delorme@gmail.com>