clean up ant and maven builds; re-generating javadocs
fix travis
Merged AT changes
Merge branch 'arktseytlin-master' into future