fix on __admin_media_prefix__ about the trailing slash
Added Alexandre Hajjar to AUTHORS
Merge