Merge branch 'master' of https://github.com/neeleshbagga/GeoGit

Conflicts:
	src/core/src/test/java/org/geogit/api/plumbing/DiffBoundsTest.java
Resolving conflict