1
Merge branch 'master' of git@github.com:Berken/FunGuangYuan.git

Conflicts:
	src/com/adams/adapter/EffectsAdapter.java
	src/com/adams/funguangyuan/MainActivity.java
完善框架 1.0
1.添加fragment
2.添加BaseActivity
3.切换fragment代码配置改为arrays文件配置