只是做个测试而已
Merge remote-tracking branch 'niwenwoda/dev'
用户模型的 related_name 由 account 改成 profile
Merge remote-tracking branch 'niwenwoda/dev'
Merge branch 'dev' of github.com:danchleo/niwenwoda
添加和删除收藏
添加收藏的问题和回答查询方法
Merge branch 'master' of github.com:danchleo/niwenwoda
自动创建 Profile
Merge branch 'master' of github.com:catroll/wenda
DELETE THE TEST FILE
添加页面资源
Merge pull request #3 from john1king/mark

添加收藏的模型方法
添加静态文件目录配置和首页视图
重命名 create_question 为 create
1. add some init data -- 3 default groups\n2. auto create profile after user instance be created
Merge branch 'master' of github.com:danchleo/niwenwoda

Conflicts:
	zhidewen/settings.py