Merge branch 'master' of github.com:agathe/AutolayoutTesting

Conflicts:
	Scrollview1ViewController.m