加入互动界面的基本元素
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	res/layout/test_chart_fragment.xml
	src/com/example/schoolapplication/MainActivity.java