added urls for static and media
Merge branch 'develop'