make all column of user ranking sortable
Merge pull request #188 from williamherry/user-ranking-sortable

make all column of user ranking sortable
fix the bog of project init in seed
Merge branch 'master' of github.com:bay6/union
Merge pull request #189 from caok/master

修复“rake db:seed不创建project”
Merge branch 'feature/activity' of https://github.com/zlx/union into feature/activity

Conflicts:
	app/models/user.rb
	config/locales/views.zh-CN.yml
Merge branch 'feature/activity' of https://github.com/zlx/union into feature/activity
markdown support for activity description
add datetime picker plugin for activity start time
Merge pull request #1 from williamherry/feature/activity

活动详细markdown和时间选择插件