static media url fixes upload template tag;
Merge remote-tracking branch 'origin/master'