update

update
Merge branch 'master' of https://github.com/SharedFriend/sandboxJ

Conflicts:
	src/sf/security/AESCryptor.java