Merge branch 'master' into navbar
made columns changes for navbar
Merge branch 'navbar'