Fixed issue with collections being inadvertently created when clearing the upload form or after missing required fields


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4355 c08608d7-6e46-0410-86ca-f2a6f1370df5
Added optional display_condition to metadata fields - tested with dropdown, text and checkbox field types


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4356 c08608d7-6e46-0410-86ca-f2a6f1370df5
Initial commit
Merge branch 'master' of github.com:rzamana/resourcespace