encrypt

made public
Merge branch 'dev_security' into staging

Conflicts:
	src/edu/smu/engr/softeng/horus/security/CryptionManager.java
Merge branch 'staging' into dev_security