minor change
Merge branch 'master' into ari_speech
TTS basic functionality added
Merge branch 'ari_speech'

Conflicts:
	public/js/mvc.js