add acts-as-taggable-on
add taggable with 2.3.3
Merge branch 'master' of github.com:bay6/union

Conflicts:
	Gemfile
fix the bug of encoding in badge_users
modify the show of userr's label
Merge pull request #220 from caok/master

初步完成标签结构