Merge branch 'auto-layout-cell'

Conflicts:
	Blocstagram.xcodeproj/xcuserdata/JS.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist