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