Minified css and js frameworks
Merge branch 'pr-1'
Merge branch 'pr-2'