Merge pull request #1 from emmairwin/7.x-dev

Dependency and description changes
Merge pull request #2 from emmairwin/7.x-dev

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