fixed upload form...looks better now
Merge branch 'css' of https://github.com/EarthSystemCoG/COG into css
Merge branch 'css' into devel