Change-Id: Ifa6171fbe2236912c666ec446a72d1553d5f9b8e
Signed-off-by: yangrun0525 <yangrun0525@163.com>
Merge branch 'master' of https://github.com/yangrun0525/ISport.git

Conflicts:
	ISport/res/values/strings.xml
	ISport/src/com/rain/isport/adapter/ViewPagerAdapter.java