add acts-as-taggable-on
完成手动颁发徽章，并调整了部分个人中心页面
Merge pull request #212 from bay6/issue_123

完成手动颁发徽章，并调整了部分个人中心页面
Update dev_diary.markdown
Update dev_diary.markdown
a bug for production
#216 fixed coffeescript template issue
Merge branch 'master' of github.com:bay6/union
revert change Fixed #216
add taggable with 2.3.3
Merge branch 'master' of github.com:bay6/union

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

初步完成标签结构
Merge pull request #219 from williamherry/hotfix/floor_count

fix new create comment floor count issue