First commit
Merge branch 'master' of https://github.com/Jayin/ETips

Conflicts:
	res/values/arrays.xml
	res/values/color.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/meizhuo/etips/activities/BaseUIActivity.java
	src/com/meizhuo/etips/activities/CourseDetailActivity.java
	src/com/meizhuo/etips/activities/CourseMainActivity.java
	src/com/meizhuo/etips/activities/CourseSettingActivity.java
	src/com/meizhuo/etips/activities/ETipsApplication.java
	src/com/meizhuo/etips/activities/ETipsMainActivity.java
	src/com/meizhuo/etips/activities/ETipsMainSettingActivity.java
	src/com/meizhuo/etips/activities/ETipsStartActivity.java
	src/com/meizhuo/etips/activities/LibBookDetailActivity.java
	src/com/meizhuo/etips/activities/LibSearchResultActivity.java
	src/com/meizhuo/etips/activities/LibraryMainActivity.java
	src/com/meizhuo/etips/activities/LifeElectricityActivity.java
	src/com/meizhuo/etips/activities/SchoolNewsDetailActivity.java
	src/com/meizhuo/etips/activities/ScoreRecordActivity.java
	src/com/meizhuo/etips/activities/SubSystemLoginActivity.java
	src/com/meizhuo/etips/common/utils/CalendarManager.java
	src/com/meizhuo/etips/common/utils/CourseUtils.java
	src/com/meizhuo/etips/common/utils/ETipsContants.java
	src/com/meizhuo/etips/common/utils/ETipsUtils.java
	src/com/meizhuo/etips/common/utils/JPushManager.java
	src/com/meizhuo/etips/common/utils/SharedPreferenceHelper.java
	src/com/meizhuo/etips/common/utils/StringUtils.java
	src/com/meizhuo/etips/model/BookInfo.java
	src/com/meizhuo/etips/model/BookStatus.java
	src/com/meizhuo/etips/model/Lesson.java
	src/com/meizhuo/etips/net/utils/HtmlParser.java
	src/com/meizhuo/etips/net/utils/SubSystemAPI.java
	src/com/meizhuo/etips/net/utils/WYUNewsAPI.java
	src/com/meizhuo/etips/receiver/AlarmReceiver.java
	src/com/meizhuo/etips/receiver/MsgReceiver.java
	src/com/meizhuo/etips/receiver/StartAlarmReceiver.java
	src/com/meizhuo/etips/ui/CourseAllWeekAdapter.java
	src/com/meizhuo/etips/ui/CourseListViwAdapter.java
	src/com/meizhuo/etips/ui/CourseSwitchDialog.java