修复custom分阶段设置heater错误
Merge branch 'master' of https://github.com/qq30135878/sunlighten.git

Conflicts:
	bin/R.txt
	bin/SunLighten.apk
	bin/classes.dex
	bin/classes/com/lemote/sunlighten/Activity/TutorialActivity$1.class
	bin/classes/com/lemote/sunlighten/Fragment/Module/Schedule/ScheduleFragment$1.class
	bin/classes/com/lemote/sunlighten/Fragment/Module/Schedule/ScheduleFragment$2.class
	bin/classes/com/lemote/sunlighten/Fragment/Module/Schedule/ScheduleFragment$3.class
	bin/classes/com/lemote/sunlighten/Fragment/Module/Schedule/ScheduleFragment$4.class
	bin/classes/com/lemote/sunlighten/Fragment/Module/Schedule/ScheduleFragment.class
	bin/classes/com/lemote/sunlighten/R$drawable.class
	bin/classes/com/lemote/sunlighten/R$id.class
	bin/classes/com/lemote/sunlighten/R$layout.class
	bin/classes/com/lemote/sunlighten/R$menu.class
	bin/classes/com/lemote/sunlighten/R$string.class
	bin/classes/com/lemote/sunlighten/R$style.class
	bin/classes/com/lemote/sunlighten/R$styleable.class
	bin/classes/com/lemote/sunlighten/widget/SLScrollBar.class
	bin/classes/com/lemote/sunlighten/widget/SLSyncView_Style2.class
	bin/classes/com/lemote/sunlighten/widget/SLTempSelectView_Style1.class
	bin/classes/com/lemote/sunlighten/widget/SLTempSelectView_Style2.class
	bin/classes/com/lemote/sunlighten/widget/SLTimeSelectView_Style1.class
	bin/classes/com/lemote/sunlighten/widget/SLTimeSelectView_Style2.class
	bin/dexedLibs/android-query-full.0.25.10-363acbb10db120172e5239cc43ed0178.jar
	bin/dexedLibs/android-support-v4-3b09b6e3788c25bf18d36c57c53aefe1.jar
	bin/dexedLibs/annotations-e51552d4fbe0d7bd5d4bb1349e013f21.jar
	bin/dexedLibs/facebook-5ca8f138f21ec2e791c11925dfe06b34.jar
	bin/dexedLibs/publiclibrary-93bcd3b2ca9967a2d31f2f8bea2f6719.jar
	bin/dexedLibs/twitter4j-core-3.0.3-878bf52a35e3d5ef08e51f0bc303f46e.jar
	bin/dexedLibs/umeng_sdk-41ab0e2d8f5e1f8b887cc52b3d6b0b38.jar
	bin/res/crunch/drawable/s7_temp_round_color.png
	bin/res/crunch/drawable/s7_temp_round_setarrow.png
	bin/res/crunch/drawable/s7_temp_slider.png
	bin/resources.ap_