updates@
updates@
updates@
updates@
updates@
updates@
updates@
updates@
Merge branch 'master' of heroku.com:sep21
media queriy updates