Support to parse verse type and label
Supported to color picker
Support to set color to custom tag
Resolved conflicts
Merge branch 'nivas22-master'
Resolved conflicts
Merge branch 'swotge-master'