UPDATE: Deleted file_entity module due toit beeing unstable and included in our current version of the media module