ticket:5 MEDIA_URL Changed
Merge branch 'ticket_5'