no message
Merge branch 'development'

Conflicts:
	Erdioo/Erdioo.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
no message
Merge branch 'development'

Conflicts:
	Erdioo/Erdioo.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
precompile Assets
Merge branch 'development'

Conflicts:
	Erdioo/Erdioo.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
no message
Merge branch 'development'

Conflicts:
	Erdioo/Erdioo.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' into development

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