move sidebar to right
Merge branch 'refs/heads/bootstrap'
Merge branch 'refs/heads/master' into bootstrap
get rid of btn-mini
Merge branch 'refs/heads/bootstrap'