Merge branch 'develop' which adds Apache 2.0 License for going open source