Before merge
Merge branch 'feature/autolayout/detail' into dev

Conflicts:
	miniShows/Base.lproj/Main.storyboard