aa
aa
Merge branch 'master' of
https://github.com/JellyWhh/statefulGoalModel-Android.git

Conflicts:
	bin/StatefulGoalModel.apk
	bin/classes.dex
	bin/classes/edu/fudan/se/goalmodel/GoalModel.class
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment$1.class
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment.class
	src_app/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment.java
添加了GoalModelController里面的几个stop、suspend、resume、reset等方法，但具体实现可能还需要修改。解决了按返回键再进入后状态丢失的问题，解决方法是：不把goal
model序列化，也就是不把它作为intent的参数传进来，而是只传一个position进来，然后从全局变量里得到具体的goal
model对象。

Merge branch 'master' of
https://github.com/JellyWhh/statefulGoalModel-Android.git

Conflicts:
	bin/StatefulGoalModel.apk
	bin/classes.dex
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment$1.class
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment$2.class
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment$3.class
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment$4.class
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment$5.class
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment$6.class
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment$MyFragmentPagerAdapter.class
	bin/classes/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment.class
	src_app/edu/fudan/se/goalmodeldetails/GoalModelDetailsFragment.java