First commit
new branch
Merge branch 'master' of https://github.com/bynkaa/PilotProject

Conflicts:
	README
	res/layout/program_detail.xml
	src/com/qsoft/pilotproject/sync/SyncAdapter.java
	src/com/qsoft/pilotproject/sync/SyncService.java
	src/com/qsoft/pilotproject/ui/activity/LoginActivity.java
	src/com/qsoft/pilotproject/ui/activity/SlideBarActivity.java
	src/com/qsoft/pilotproject/ui/fragment/CommentFragment.java
	src/com/qsoft/pilotproject/ui/fragment/ContentPlayerFragment.java
	src/com/qsoft/pilotproject/ui/fragment/DetailFragment.java
	src/com/qsoft/pilotproject/ui/fragment/Home.java
	src/com/qsoft/pilotproject/ui/fragment/HomeListFragment.java
	src/com/qsoft/pilotproject/ui/fragment/ProgramFragment.java
	src/com/qsoft/pilotproject/ui/fragment/ThumbnailFragment.java