Initial deploy from Eclipse
Add license
FIX conflict