Added missing field in Custom Field compared to DocField
Fixed conflict
Custom Field: Label is mandatory only if fieldname not exists
Custom Field: Label is mandatory only if fieldname not exists
Merge pull request #398 from nabinhait/hotfix

Added missing field in Custom Field compared to DocField