Add license
Merge branch 'javaee6'