Upgraded Media module to 7.x-2.x for custom link label functionality.
Updated README with Media and File Entity module version information.
Resolved README merge conflict.
Merge pull request #52 from ua-snap/imce_rename

Upgrade Media and File Entity modules