Revert "Revert "Merge and close PR #43""

This reverts commit b03200dbfc9acb5030633d7cd4326a50f2c3918a.

Re-open #43
Fix various issues with license placement
Fix Java and Groovy licensing
Fix spacing issues in XML with license header
This closes #56

* github/pr/56:
  Fix spacing issues in XML with license header
  Fix Java and Groovy licensing
  Fix various issues with license placement
  Revert "Revert "Merge and close PR #43""