Merge branch 'develop' of github.com:tracim/tracim_front into develop

src/appFactory.js

@@ -37,7 +37,7 @@ export function appFactory (WrappedComponent) {
           renderApp={this.renderApp}
           renderCreateContentApp={this.renderCreateContentApp}
           emitEventApp={this.emitEventApp}
-          hideApp={this.hideApp}
+          // hideApp={this.hideApp}
         />
       )
     }

src/reducer/contentType.js

@@ -12,9 +12,9 @@ export function contentType (state = [], action) {
         availableStatuses: ct.available_statuses.map(as => ({
           label: as.label,
           slug: as.slug,
-          fa_icon: as.fa_icon,
+          faIcon: as.fa_icon,
           hexcolor: as.hexcolor,
-          global_status: as.global_status
+          globalStatus: as.global_status
         }))
       }))