modified:   AndroidManifest.xml
	modified:   gen/my/home/lehome/R.java
	modified:   res/layout/activity_main.xml
	new file:   res/layout/fragment_pager.xml
	modified:   res/menu/delete_shortcut_item.xml
	modified:   res/menu/shortcut.xml
	modified:   res/values/strings.xml
	modified:   src/my/home/lehome/activity/MainActivity.java
	new file:   src/my/home/lehome/adapter/SectionsPagerAdapter.java
	modified:   src/my/home/lehome/application/LEHomeApplication.java
	modified:   src/my/home/lehome/fragment/ChatFragment.java
	new file:   src/my/home/lehome/fragment/PagerFragment.java
	modified:   src/my/home/lehome/fragment/ShortcutFragment.java
	modified:   src/my/home/lehome/helper/MessageHelper.java
	modified:   src/my/home/lehome/service/ConnectionService.java
Merge branch 'master' of https://github.com/legendmohe/LEHome_android

Conflicts:
	src/my/home/lehome/activity/MainActivity.java
	src/my/home/lehome/service/ConnectionService.java

	modified:   src/my/home/lehome/activity/MainActivity.java
	modified:   src/my/home/lehome/fragment/ChatFragment.java
	modified:   src/my/home/lehome/service/ConnectionService.java