test
update
Merge branch 'temp' into master1

Conflicts:
	AppDelegate.m
	Base.lproj/Main.storyboard
	TSHomePageHeaderView.m
	TSHomePageScrollView.h
	TSHomePageViewController.m