Testing updates and responsive design update
Merge branch 'dev'