dvd little fixes, and dvd admin not showing fix
Merge branch 'master' of github.com:PrincetonUSG/USG-srv-dev
fixes so cal can migrate south
Merge branch 'master' of github.com:PrincetonUSG/USG-srv-dev
Merge branch 'master' of github.com:PrincetonUSG/USG-srv-dev
Merge branch 'master' of github.com:PrincetonUSG/USG-srv-dev
forgot a quote