Upgrade dependency to maps from _r2 to _r3.
Add dependency to catch-exception library in test scope.

CatchException library simplifies and clarifies writing tests for exceptions handling
 in production code. Checkout samples at: https://code.google.com/p/catch-exception/
[ISSUE 425] NPE when null cursorFactory passed [FIX]

Added validating cursorFactory param against null reference.
If it's null, default implementation from rawQuery is used.

Added test.
Change r2 to g3 in build.xml
Merge branch 'polidea/issue/425/npe_cursor_factory'

* polidea/issue/425/npe_cursor_factory:
  Change r2 to g3 in build.xml
  [ISSUE 425] NPE when null cursorFactory passed [FIX]
  Add dependency to catch-exception library in test scope.
  Upgrade dependency to maps from _r2 to _r3.

Conflicts:
	src/main/java/org/robolectric/shadows/ShadowSQLiteDatabase.java