Merge pull request #132 from amcgowanca/7.x-1.x

Updated version of ImageX Media and Wysiwyg to latest.
Fix the problem that happens because some entities don't have uuids associated with them.
Merge pull request #133 from woombo/hotfix/uuid_unknown_column_in_field_list

Hotfix: Add extra validation case entities don't have uuids associated
Fixed merge conflicts.