no message
Merge branch 'bar1' into baratjuk

Conflicts:
	TestAutoLayout3/TableViewController.swift
Merge branch 'bar1'

Conflicts:
	TestAutoLayout3/TableViewController.swift
Merge branch 'baratjuk'

Conflicts:
	TestAutoLayout3/TableViewController.swift
	TestAutoLayout3/TableViewController.swift.orig