order by contact
order by contact
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/java/com/ingesup/yo/adapter/ContactDbAdapter.java
	gradlew
	gradlew.bat
order by contact