Rename
Merge branch 'master' into gh-pages

Conflicts:
	prez-panda-roux-webview-android/Gruntfile.js
	prez-panda-roux-webview-android/package.json
	prez-panda-roux-webview-android/resources/fight.png
	prez-panda-roux-webview-android/resources/firefox5.orig.png
	prez-panda-roux-webview-android/resources/firefoxos1.jpg
	prez-panda-roux-webview-android/resources/firefoxos2.jpg
	prez-panda-roux-webview-android/resources/firefoxos3.jpg
	prez-panda-roux-webview-android/resources/firefoxos4.jpg
	prez-panda-roux-webview-android/resources/plush-firefox.jpg
	prez-panda-roux-webview-android/resources/webview_healthtap.jpeg
	prez-panda-roux-webview-android/resources/webview_healthtap.png
	prez-panda-roux-webview-android/resources/webview_healthtap.xcf
	prez-panda-roux-webview-android/resources/webview_healthtap_simple.xcf
Useless