temporarily stuff geo stuff in separate example app
Merge remote-tracking branch 'upstream/master' into add-generic-foreign-key-field

Conflicts:
	example/api/urls.py
	example/api/views.py
move import_class above APIField
add build_obj_and_kwargs
move setup_resource onto APIField