添加新activity，修改baseactivity添加点击接口
Merge branch 'master' of https://github.com/LiesLee/suoping.git

Conflicts:
	AndroidManifest.xml