Merge branch 'master' into user-index
add reputation & pagination to list
Change UserController to use require_user for edit authorisation
update gems
fix issue where long usernames break page layout
increase spacing between elements
Merge branch 'user-index'
add link to user index in header
update gems
merge origin
Revert "merge origin"

This reverts commit e4e5642a0a977c519c66b7a1bb9ae81c02e85e63.
update rails
fix #sidebar specificity issues
Merge branch 'master' into badges