sdasd
Merge branch 'master' of https://github.com/mrcapp/phonegap

Conflicts:
	www/.DS_Store
	www/assets/css/style.css
	www/assets/img/banner_history.jpg
	www/assets/img/banner_pipe.jpg
	www/assets/img/banner_pipeline_const.jpg
	www/assets/img/banner_safety.jpg
	www/assets/img/banner_story1.jpg
	www/assets/img/channel_safety.jpg
	www/assets/img/css/banner-cc-operator.jpg
	www/assets/img/css/banner-default-blur.jpg
	www/assets/img/css/banner-default.jpg
	www/assets/img/css/bg-cubes.png
	www/assets/img/css/bg-dark-grey.png
	www/assets/img/css/bg-diamonds.png
	www/assets/img/css/bg-gradient-overlay.png
	www/assets/img/css/bg-light-grey.png
	www/assets/img/css/bg-paven.png
	www/assets/img/css/bg-polaroid.png
	www/assets/img/css/icon-down-arrow.png
	www/assets/img/css/icon-green-check.png
	www/assets/img/css/icon-indicator-down.png
	www/assets/img/css/icon-indicator-right-dark.png
	www/assets/img/css/icon-indicator-right-light.png
	www/assets/img/css/icon-indicator-right-sprite.png
	www/assets/img/css/icon-indicator-right-yellow.png
	www/assets/img/css/icon-indicator-up.png
	www/assets/img/css/icon-search.png
	www/assets/img/css/test-grid-60x20.png
	www/assets/img/favicons/apple-touch-icon-114x114.png
	www/assets/img/favicons/apple-touch-icon-144x144.png
	www/assets/img/favicons/apple-touch-icon-57x57.png
	www/assets/img/favicons/apple-touch-icon-72x72.png
	www/assets/img/favicons/eb.png
	www/assets/img/favicons/favicon.ico
	www/assets/img/favicons/logo.png
	www/assets/img/favicons/logo.svg
	www/assets/img/feature_safety.jpg
	www/assets/img/icon-reference-contact.png
	www/assets/img/icon-reference-facts.png
	www/assets/img/icon-reference-map.png
	www/assets/img/icon-reference-media.png
	www/assets/img/icon-share.jpg
	www/assets/img/logo.png
	www/assets/img/story_community.jpg
	www/assets/img/story_economic_benefit.jpg
	www/assets/img/story_geothermal.jpg
	www/assets/img/story_pipeline_safety.jpg
	www/assets/img/story_safety.jpg
	www/assets/img/story_safety2.jpg
	www/assets/img/ui/search-hover.png
	www/assets/img/ui/search-hover@2x.png
	www/assets/img/ui/search.png
	www/assets/img/ui/search@2x.png
	www/assets/js/html5.js
	www/assets/js/rapid.js
	www/channels.html
	www/config.xml
	www/contact.html
	www/index.html
	www/news.html
	www/ref.html
	www/reference.html
	www/safety.html