Added phonegap to .travis.yml
Add android update sdk
Add android. remove android update
Add -no-ui --force
Added language: android
Merge branch 'master' into travis-integration

Conflicts:
	.travis.yml
Merge branch 'travis-integration'