Better active_navigation helper method.
Merge branch 'augmenting245_redesigning_website' into develop