k
Merge branch 'development'

Conflicts:
	HeyJarvis.xcworkspace/xcuserdata/Hichamoaj.xcuserdatad/UserInterfaceState.xcuserstate
Working greeting and time
Mute mic when speaking and more
Merge branch 'action'