Updated package.
Fixed dependency error with common_fields, should be imagex_common_fields.
Resolved conflicts.