Travis change
Android license is upgraded
Merge branch 'master' of https://github.com/ehsan1772/Android_Studio_Test

Conflicts:
	.travis.yml
	app/build.gradle