Added support for media folder in dev.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mysite/urls.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Repointing to TACC server