Added uploaded by and made uploaded on actually correct. Previously was showing most recently changed.
adding history section to Jobs page
Merge branch 'master' into job_history
Merge branch 'master' into date_format
Changed the time display to be set in the freemarker template