Added degrees Fahrenheit to weather view.
Merge branch 'master' into ari_gmail_api

Conflicts:
	jeeves-demo/platforms/android/assets/www/node_modules/phpjs/node_modules/.bin/_mocha
	jeeves-demo/platforms/android/assets/www/node_modules/phpjs/node_modules/.bin/css-beautify
	jeeves-demo/platforms/android/assets/www/node_modules/phpjs/node_modules/.bin/html-beautify
	jeeves-demo/platforms/android/assets/www/node_modules/phpjs/node_modules/.bin/js-beautify
	jeeves-demo/platforms/android/assets/www/node_modules/phpjs/node_modules/.bin/mocha
	jeeves-demo/platforms/android/assets/www/node_modules/phpjs/node_modules/js-beautify/node_modules/.bin/nopt
	jeeves-demo/platforms/android/assets/www/node_modules/phpjs/node_modules/mocha/node_modules/.bin/jade
	jeeves-demo/platforms/android/cordova/node_modules/.bin/shjs
	jeeves-demo/www/index.html
	jeeves-demo/www/js/mvc.js
	jeeves-demo/www/node_modules/phpjs/node_modules/.bin/_mocha
	jeeves-demo/www/node_modules/phpjs/node_modules/.bin/css-beautify
	jeeves-demo/www/node_modules/phpjs/node_modules/.bin/html-beautify
	jeeves-demo/www/node_modules/phpjs/node_modules/.bin/js-beautify
	jeeves-demo/www/node_modules/phpjs/node_modules/.bin/mocha
	jeeves-demo/www/node_modules/phpjs/node_modules/js-beautify/node_modules/.bin/nopt
	jeeves-demo/www/node_modules/phpjs/node_modules/mocha/node_modules/.bin/jade
Merge branch 'master' into ari_gmail_api
fixed merge
still trying to decode messages