updated to ignore merge leftover files (orig) and ant builds
fixed test failures
Merge branch 'master' into base64-calls-refactor