allow specify cordova version when building apps
fix for extra http being added
update to change log
Merge branch '6258-choose-cordova-version' of github.com:feedhenry/fh-fhc into zendesk-3351
merged with Wei branch 6258-choose-cordova-version
update change log
packagebumped/change log updated
Merge branch 'master' into 6039_services

* master:
  packagebumped/change log updated
  update change log
  merged with Wei branch 6258-choose-cordova-version
  update to change log
  fix for extra http being added
  allow specify cordova version when building apps

Conflicts:
	CHANGELOG.txt
	package.json