added custom template tag for rendering uploads;
Merge remote-tracking branch 'origin/master'