Merged with trunk
Some invisible changes
Remove wrongly added manifest for org.apache.axis
Compleated the tests for the branch
Readded some depricated methods to ensure the correct working of the MJCG
Fixed problem with wrong iterator