Changed BASE64 Encoder from sun to apache
Merge remote-tracking branch 'origin/master'