Merge branch 'develop'

Author: toastercup

app/models/concerns/tree.rb

@@ -1,10 +1,17 @@
+require 'cortex/field_types/core/boolean/boolean_field_type'
+require 'cortex/field_types/core/boolean/boolean_cell'
+
+require 'cortex/field_types/core/date_time/date_time_field_type'
+require 'cortex/field_types/core/date_time/date_time_cell'
+
+require 'cortex/field_types/core/tag/tag_field_type'
+require 'cortex/field_types/core/tag/tag_cell'
 
-require 'cortex/field_types/core/*'
 require 'cortex/field_types/core/text/text_field_type'
 require 'cortex/field_types/core/text/text_cell'
 
-require 'cortex/field_types/core/boolean/boolean_field_type'
-require 'cortex/field_types/core/boolean/boolean_cell'
-
 require 'cortex/field_types/core/tree/tree_field_type'
 require 'cortex/field_types/core/tree/tree_cell'
+
+require 'cortex/field_types/core/user/user_field_type'
+require 'cortex/field_types/core/user/user_cell'