first push
fix rails error for validation error in collections controller#create, updating modal_logic gem
Merge pull request #95 from atomical/bugfix/VOV-1854

Bugfix/vov 1854
Merge pull request #96 from atomical/bugfix/VOV-1908

bugfix/VOV-1908
units class method is used like an association.  it should never return nil.
returning an array higher in the stack
Merge pull request #97 from atomical/bugfix/VOV-1854

units class method is used like an association.  it should never return nil
Clear out the cached list of MasterFiles before trying to delete/validate the MediaObject
Merge pull request #98 from avalonmediasystem/bugfix/VOV-1866

Bugfix/vov 1866
Require presence and uniqueness of username and email attributes on user model
Batch manifest can have username or email of uploading user
Allow group/collection membership to specify users by username or email
Add error if user doesn't exist
Merge pull request #100 from avalonmediasystem/bugfix/user-email

Users must have both usernames and email addresses
Merge pull request #99 from avalonmediasystem/enhancement/usernames

Enhancement/usernames
Link ldap initialization if present
Discover groups based on both username and email
user_key needs to be email
More User model tweaking
Revert "user_key needs to be email"

This reverts commit f5d5cc265bf8b9fc5abbb7e61182dafa8fb0cedb.