css media queries
Merge branch 'ui' into development
Merge pull request #375 from luixxiul/development

css media queries