menubar
merge
k
Added icons, and added NSUSERNOTIFICATION
Merge branch 'development'

Conflicts:
	HeyJarvis.xcworkspace/xcuserdata/Hichamoaj.xcuserdatad/UserInterfaceState.xcuserstate