Merge branch 'parent_pom'
fix formatting
fixing license headers