Fix fr locale
Fixing fragment witching behaviour
Merge branch 'master' into rest

Conflicts:
	res/values-fr/strings.xml
Merge remote-tracking branch 'origin/rest' into rest

Conflicts:
	src/org/omnidebt/client/view/main/MainODActivity.java
	src/org/omnidebt/client/view/main/contact/ContactFragment.java
	src/org/omnidebt/client/view/main/dashboard/AddDebtFragment.java
	src/org/omnidebt/client/view/main/dashboard/DashboardFragment.java
Fixing previous merge mistake
Fix some bugs from previous merge