Merge "Add liscense to file headers"