fix in media path detection regexp and media path building
added USER_ID to the exported variables
Merge branch 'origin/master'