Allow passing block to nav_link helper and add glyphicon to sidebar
Merge branch 'sidebar'