adding changes core data
Merge branch 'master' of github.com:iamchenchen/simpleTask

Conflicts:
	View/iDCCreateTaskViewController.m
	View/iDCTaskListViewController.m
	simpleTask/coredata/Task.h
	simpleTask/coredata/simpleTaskData.xcdatamodeld/simpleTaskData.xcdatamodel/contents
fix for hourToFinish