Not merged with master.
Fixed merge problems.
Merge branch 'master' into ari_speech

Conflicts:
	public/js/mvc.js
Email speech working well.
Implemented ability to turn off speech hands-free.