master
Merge branch 'baratjuk'

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

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

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

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

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