ready to merge
Merge commit 'de7c8752475391fc5d896a262a8603b87fdcd9a3'

Conflicts:
	testProject/ViewController.m