Login : remise en place
Bugs : corrections
sorry
Merge branch 'sf' of https://github.com/cafecentral/bonaparte into sf
conflict resolution.
conflict résolution