Bug fix: the column name management in ShadowAbstractCursor assumed you didn't subclass it yourself.
Bug fix to our bug fix.
Fix git history

Conflicts:
	src/main/java/com/xtremelabs/robolectric/shadows/ShadowAbstractCursor.java