convergence Destinie and Destinie2
correction on civil and work state
correction and test in of_to_liam
change civilstate encoding

To be consistent with openfisca