Merge branch 'master' of https://github.com/donkikochan/Architexture

Conflicts:

samples/Architexture/Architexture.xcodeproj/project.xcworkspace/xcuserda
ta/DonKikochan.xcuserdatad/UserInterfaceState.xcuserstate
	samples/Architexture/Architexture/MainStoryboard.storyboard