Merge branch 'release/20140501'
Merge branch 'release/20140506'
fixed #22
redis paperclip bug
[skip ci]