Merge pull request #50 from cassandra-project/develop

Develop
close #225, #111

#111: added the upload form functionality and layout, doesn't work
though until I get a valid URL to post the form
Merge pull request #235 from fgiannar/develop

Develop