Updated various to match working simplejspservlet
Merge branch 'master' of https://luckievaj@github.com/luckievaj/ics425.git
Merge branch 'master' of https://luckievaj@github.com/luckievaj/ics425.git
clearing upload queue