test
abc
Merge remote-tracking branch 'origin'
Added login page, fixed nibs
Conflicts:
	NSStatusItemTest/NSStatusItemTest.xcodeproj/project.xcworkspace/xcuserdata/marco.xcuserdatad/UserInterfaceState.xcuserstate