Delete unnecessary file ended with ~ and modify the license for the weather source
Change the weather icon function
Change the Setting Page
Merge branch 'ari_gmail_api'

Conflicts:
	jeeves-demo/www/index.html
	jeeves-demo/www/js/mvc.js