change license to BSD + Patents
Merge branch 'develop'