listview
Merge branch 'master' of https://github.com/ribardb/socialbook

Conflicts:

socialbookProject/socialbook/src/main/java/com/example/socialbook/List.j
ava

socialbookProject/socialbook/src/main/java/com/example/socialbook/MainAc
tivity.java
	socialbookProject/socialbook/src/main/res/layout/inscription_layout.xml
	socialbookProject/socialbook/src/main/res/layout/list_layout.xml
maj