controller, responsive design, css
merge
Merge branch 'front5'