add badge model and spec
merge master
add schema to gitignore
modify gitignore
Merge branch 'master' of github.com:bay6/union into issue_123
Merge pull request #204 from vincent178/master

READY: change id to rank
modify some user ability & finish hz page
Merge pull request #205 from bay6/issue_123

Issue 123  完成徽章基本结构。
merge
added assets to nginx config
Merge branch 'master' of github.com:bay6/union
modify the show of user
remove email from ranking
modify the ranking
Merge pull request #207 from caok/master

modify something
added hide email for manager only
added one more ignore
fix layout issue
fix floor count issue and add markdown support for comment
fix register need login first