prepapre for index2d
entrySet for DBOject
Merge remote-tracking branch 'github/master' into index2d

Conflicts:
	src/main/java/com/foursquare/fongo/impl/Util.java
	src/test/java/com/foursquare/fongo/FongoIndexTest.java
commit resolution for index2d