Merge pull request #495 from rishwanthavr/master

Variable name changed from CUSTOM_FILEDS into CUSTOM_FIELDS in ColumnFam...
Added fix for folder reorder issue
Merge pull request #496 from skpcharles/master

Added fix for folder reorder issue
Column family custom_fields_group added