Bdd utilisateur metier
Merge branch 'master' of https://github.com/ribardb/socialbook

Conflicts:

socialbookProject/socialbook/src/main/java/com/example/socialbook/MainAc
tivity.java