Moving to https
Babaorum
Merge branch 'rest' of https://github.com/OmniDebt/OmniDebt-Android.git into rest
Piste pour HTTPS
Try HTTPS using OkHttp and KeyStore
PotatoSalad
Dsl
Merge branch 'token' into rest

Conflicts:
	src/org/omnidebt/client/controller/ContactProvider.java
	src/org/omnidebt/client/controller/DebtController.java
	src/org/omnidebt/client/controller/UserController.java
	src/org/omnidebt/client/view/main/DebtAdapter.java
	src/org/omnidebt/client/view/main/dashboard/DashboardFragment.java