添加activity 页面
添加朋友插件
增加权限页面
Merge branch 'master' of https://github.com/gabrieltong/rails-baocheng

Conflicts:
	Gemfile
	config/locales/zh.yml
	config/routes.rb