added viewport back to fix media query
Merge branch 'develop' into staging