Changed PBKDF2WithHmacSHA256 to PBKDF2WithHmacSHA1
so it will work with Java 7.
(Removed debugging code)
Merge remote-tracking branch 'origin/master'
Removed extra debugging code