Update to Cordova 2.8.1
Merge branch 'master' of https://github.com/hpp/thump-n-snap

Conflicts:
	.idea/.name
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml
	AndroidManifest.xml
	assets/www/css/index.css
	assets/www/img/cordova.png
	assets/www/img/logo.png
	assets/www/index.html
	assets/www/js/index.js
	assets/www/js/thumpNsnapMechanics.js
	assets/www/main.js
	assets/www/master.css
	assets/www/res/icon/android/icon-36-ldpi.png
	assets/www/res/icon/android/icon-48-mdpi.png
	assets/www/res/icon/android/icon-72-hdpi.png
	assets/www/res/icon/android/icon-96-xhdpi.png
	assets/www/res/screen/android/screen-hdpi-landscape.png
	assets/www/res/screen/android/screen-hdpi-portrait.png
	assets/www/res/screen/android/screen-ldpi-landscape.png
	assets/www/res/screen/android/screen-ldpi-portrait.png
	assets/www/res/screen/android/screen-mdpi-landscape.png
	assets/www/res/screen/android/screen-mdpi-portrait.png
	assets/www/res/screen/android/screen-xhdpi-landscape.png
	assets/www/res/screen/android/screen-xhdpi-portrait.png
	assets/www/spec.html
	assets/www/spec/helper.js
	assets/www/spec/index.js
	assets/www/spec/lib/jasmine-1.2.0/MIT.LICENSE
	assets/www/spec/lib/jasmine-1.2.0/jasmine-html.js
	assets/www/spec/lib/jasmine-1.2.0/jasmine.css
	assets/www/spec/lib/jasmine-1.2.0/jasmine.js
	build.xml
	cordova/appinfo.jar
	cordova/build
	cordova/clean
	cordova/log
	cordova/run
	local.properties
	res/drawable-hdpi/icon.png
	res/drawable-ldpi/icon.png
	res/drawable-mdpi/icon.png
	res/drawable-xhdpi/icon.png
	res/drawable/icon.png
	res/layout/main.xml
	res/values/strings.xml
	res/xml/config.xml