Merge of develop.

Added validators for contents of uploaded zip.