Merge Conflict and Fixed responsive view
Merge branch 'dev' of https://github.com/jr2wolfgang/wb_stage into dev