fix s3
change to col-xs
Merge branch 'master' of https://github.com/berc-web/berc_web