Update README.md
Update LICENSE.md
update travis
Merge remote-tracking branch 'origin/develop' into feature/batch

Conflicts:
	.travis.yml
	LICENSE.md
	README.md