Adding license header
Updating license header for eclipse formating file
Merge branch 'matzew-fixes'