more refactoring
Merge remote-tracking branch 'upstream/iOSunit_testing'

Conflicts:
	ProjectGOxcode/ProjectGO/ObligationCreationViewController.m