added beta site config
no message
no message
temp commit for pull
Merge branch 'master' of https://git.oschina.net/kevinwang/jzhan
加入了七牛截取正方形图片功能
Merge branch 'master' of https://git.oschina.net/kevinwang/jzhan
memcached设置改用闭包实现
改完我的东西了，反正很多很多我也不知道改了哪些
Merge branch 'Sh-Br-140719-1'

Conflicts:
	application/views/jzhan/u/block_profile_0.php
	application/views/jzhan/u/block_profile_1.php
加入哪个sb让我乱merge以后 复制粘贴什么一大堆不知道多弱智的操作 然后好像修复了 反正不管了 我要去睡觉了
Merge branch 'master' of https://git.oschina.net/kevinwang/jzhan