test.
Merge branch 'RefactorClassName'

Conflicts:
	ControllingSource/DetailViewController.m