Added correct subdir for media module and correct version for file_entity
Moved smartqueue into contrib folder in make file
Merge remote-tracking branch 'origin' into release