Pull request 1208 lps 30020

Hey Eduardo,

Can you review this one.
I didn't do anything to fileupload.ftl. Looks pretty messy to me, but leave that one for you to review... There is more info on the LPS.

Can you send to Brian after you're done?

Thanks,

Hugo