te
Merge branch 'master' of https://github.com/shahuwang/weixin.git

# By davenzhang (3) and evantre (3)
# Via davenzhang (1) and evantre (1)
* 'master' of https://github.com/shahuwang/weixin.git:
  styles and structure
  modify background color
  Add Blog
  璇劽¨?潞鑰呫€佽瘎璁烘椂闂淬€佽瘎璁哄唴瀹瑰垎莽娄?
  Signed-off-by: davenzhang <zhangshuaizaxia@163.com>
  Signed-off-by: davenzhang <zhangshuaizaxia@163.com>

Conflicts:
	datacrawler/datacrawler/spiders/bbs_comment.py
Merge branch 'master' of https://github.com/shahuwang/weixin.git

# By evantre
# Via evantre
* 'master' of https://github.com/shahuwang/weixin.git:
  float problem
  big changes, add comment, modify styles and structure
youwu
Merge branch 'master' of https://github.com/shahuwang/weixin.git

# By evantre
# Via evantre
* 'master' of https://github.com/shahuwang/weixin.git:
  simple pagination
  misoperation recover
  error
  backtotop
  delete <img> in index
  comment split

Conflicts:
	Blog/templates/index.html
Merge branch 'master' of https://github.com/shahuwang/weixin.git

# By evantre
# Via evantre
* 'master' of https://github.com/shahuwang/weixin.git:
  little change in styles
  separate css/js from base
1
Merge branch 'master' of https://github.com/shahuwang/weixin.git

# By evantre
# Via evantre
* 'master' of https://github.com/shahuwang/weixin.git:
  correct pagination and adapt devices

Conflicts:
	Blog/blog.py
apache兼容