Committed with test view 7.
Merge remote-tracking branch 'origin/slave'

Conflicts:
	TestRepository/TestRepository.xcodeproj/project.pbxproj