Use the old cell for now.
More details.
Merge branch 'master' of github.com:shepting/AutoLayout

Conflicts:
	AutoLayoutDemo/AutoLayoutDemo/AppDelegate.swift
	AutoLayoutDemo/AutoLayoutDemo/Base.lproj/Main.storyboard