data source changed to coredata
Merge branch 'coreData2'
Merge branch 'master' of github.com:gatropino/iServeRepo
Merge branch 'coreDataIntegrated' of https://github.com/mscline/iServeRepo into mscline-coreDataIntegrated

Conflicts:
	iServe/CoreData.h
	iServe/CoreData.m