Revert "Merge pull request #12 from AustinHeerwagen/dev_security"

This reverts commit df4ffbe1f642428e2b7142f96c89a9c9df59ed1d, reversing
changes made to 92bedbeb795a0d835891351915d471b1b43948a1.
Fixing the package statements, I hope
Merge branch 'staging' of https://github.com/AustinHeerwagen/SMU_SoftEng_AVStream into staging
Changing the security package statements
Fixing a few small bugs in security and common infrastructure
Merge branch 'staging' into dev_security