Resolve _nav.scss conflict
Merge branch 'danaw-master'