Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Always use filename in flash message
Use consistent language to describe restricted access
Merge pull request #157 from avalonmediasystem/bugfix/VOV-2026

Use consistent language to describe restricted access (VOV-2026)
Merge pull request #156 from avalonmediasystem/bugfix/VOV-2024

Always use filename in flash message (VOV-2024)
Ask for confirmation before deleting master files
Switch master file delete confirmation from modal to popover for clarity
Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop
Revert change to reflect PO request
Merge pull request #160 from avalonmediasystem/bugfix/vov-2206

Revert "authenticated" to "logged in"
Adding two missed references to authenticated
Merge pull request #161 from avalonmediasystem/bugfix/vov-2206

Adding two missed references to authenticated
Merge pull request #159 from avalonmediasystem/bugfix/vov-2027

Bugfix/vov 2027
Shrink NU deploy branch to the bare essentials
Change nuldap so netID => username, email => email
Reindex everything on deploy
Only reindex if the AVALON_REINDEX environment variable is set