travis yml
Merge branch 'develop'
Changed license header from automatically generated to the Apache License 2.0 header