commit
~~~
change interface
Merge branch 'master' of https://github.com/Tacus/campus

Conflicts:
	proj.android/src/com/campus/domain/TradeInfo.java
m
Merge branch 'master' of https://github.com/Tacus/campus
modify
Merge branch 'master' of https://github.com/Tacus/campus

Conflicts:
	proj.android/res/drawable/radio_bg_selector.xml
	proj.android/res/drawable/radio_index_bg_selector.xml
	proj.android/res/drawable/radio_text_selector.xml
	proj.android/res/layout/activity_main.xml

Signed-off-by: gannicus <iam.moxuan@gmail.com>