Pushing current AV into Staging
Merge pull request #17 from AustinHeerwagen/dev_security

Dev security
AVPackager and AVMessenger changed to call cominfra and security functions
Commented out encrypt to test cominfra functionality within AVPackager
Fixing library paths and added exception handling
Merge branch 'staging' of https://github.com/AustinHeerwagen/SMU_SoftEng_AVStream into staging
Added try catch around encryptPayload
Added handling for video message type
Created AVPackageTestServer.java
Changed bais to byte[] for avMessenger and avPackager

Still need to change in avReceiver
Adding error checking (tmgriffin)
update .gitignore to ignore .mpeg, .wav, mac&win
Continuing the updates
Change in AVReceiver to reflect migration from bais to byte[]
Imported AVReceiver into cominfra's MessageHandler and added callback to switch statement

(with permission of cominfra team member)
Merge branch 'staging' of https://github.com/AustinHeerwagen/SMU_SoftEng_AVStream into staging
Merge branch 'dev_security' into staging

Conflicts:
	src/AVPackageTestClass.java
	src/AVPackageTestServer.java
	src/edu/smu/engr/softeng/horus/security/CryptionManager.java
	src/edu/smu/engr/softeng/horus/security/KeyManager.java
cyrpiton

messed up
Merge branch 'staging' into dev_security