project progress
Adding java 7 support
Resolve Conflicts