no message
Merge branch 'development'

Conflicts:
	Erdioo/Erdioo.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
update  main window
no message
Merge branch 'master' into development

Conflicts:
	Erdioo/Erdioo.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate