still unsuccessful with gmail api
removed php.js from html file
Merge branch 'ari_gmail_api'

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