add right filter button
add collection view cell
Merge branch 'master' of github.com:taglog/baobaowansha

Conflicts:
	baobaowansha2.xcodeproj/project.pbxproj
right side bar