New with android working
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	Geo/androidFolder/bin/androidApp.apk
	Geo/androidFolder/bin/dexedLibs/cordova-2.9.0-3ab9e12b76c390037fd804d6e836f21a.jar
	Geo/androidFolder/bin/resources.ap_
	Geo/juneIosPhonegap/www/iosMainjs/iosGeo.js
bugs worked out for final
Merge remote-tracking branch 'origin/master' into gh-pages