merge origin
Revert "merge origin"

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