Added license to all files
Merge branch 'develop'