Resolving conflict
resolving conflicts
Merge remote-tracking branch 'noctella/master'
Merged-successfully

All test cases in DiffBoundsTest.java pass
Committing before merging
Resolved conflicts
Removed the iterable member, and setter method in DiffBounds.java
Merge branch 'master' of https://github.com/neeleshbagga/GeoGit

Conflicts:
	src/core/src/test/java/org/geogit/api/plumbing/DiffBoundsTest.java
null checks