Rong init
Merge branch 'master' of github.com:tongjiapp/android

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	AndroidManifest.xml
	project.properties
	res/values/dimens.xml
	src/com/tongji/fruit/MainActivity.java
Merge branch 'master' of github.com:tongjiapp/android

Conflicts:
	AndroidManifest.xml
	project.properties
	res/layout/selfcenter_ui.xml
初期页面