Merge pull request #2 from amcgowanca/7.x-dev

Core: Revised the initial version of code sent by Emma.
Core: Adding field_image and field_link to the common fields
Removing local project path as it could change in the future
Merge pull request #3 from adamrbrown/core/add-link-image-fields

Core: Core/add link image fields
added field_file_attachment
MISC: label change

also removed file that shouldn't be in commit
MISC: removed file that shouldn't be in commit (typo field name)
Merge pull request #4 from emmairwin/7.x-dev

Feature: Added field_file field.
MISC : refresh build to fix file_field issues.
Bugfix: LDC-200: Removed the field_file instance from this feature.
Merge pull request #6 from amcgowanca/resolution/emmas_repo_with_fixes

Resolution: Pull Request #5