Add the opam package informations.
Merge remote-tracking branch 'up/master'
update with latest oasis

update2
fix oasis