Merge branch 'master' into feature-plugin2

resource/css/crowi.scss

@@ -4,8 +4,6 @@
 // import bootstrap
 @import 'bootstrap';
 
-@import 'font-awesome';
-
 // crowi component
 @import 'layout';
 @import 'page';