Updated .travis.yml for master
Merge branch 'develop'

Conflicts:
	.travis.yml
Updated dependency badge
updated .travis.yml for develop branch