Better layer support
Merge branch 'master' of https://github.com/KD-Lowe/CookieCutter

Conflicts:
	CookieCutter/Base.lproj/Main.storyboard