license and copyrigth header added
Merge branch 'develop'