Feature #56, fixed navbar collapse transition
Merge branch 'feature-56' into develop