Added license, readme
Updated poms
Fixed merge conflict