Merge pull request #207 from caok/master

modify something
added hide email for manager only
added one more ignore
add acts-as-taggable-on
fix layout issue
fix floor count issue and add markdown support for comment
fix register need login first
add emoji support to markdown
完成手动颁发徽章，并调整了部分个人中心页面
Merge pull request #211 from williamherry/hotfix/activity

修了一些页面上的issue.给markdown加上了emoji
translate some term of activity to chinese
Merge pull request #213 from williamherry/hotfix/activity

translate some term of activity to chinese
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