* add develop to branches tracked by travis ci
Merge branch 'master' into develop

* master:
  * add develop to branches tracked by travis ci