test commit
Merge branch 'master' of https://github.com/lygn128/newIphone_2_1_0

Conflicts:
	Image/PeopleNewsReaderPhone.xcdatamodeld/PeopleNewsReaderPhone.xcdatamodel/elements
	Image/PeopleNewsReaderPhone.xcdatamodeld/PeopleNewsReaderPhone.xcdatamodel/layout