allow fields to be defined on API view
Preferentially choose api view methods over model to display fields
Merge commit 'ad1065d'

Conflicts:
	backbone/views.py
Merge commit '04599f2'

Conflicts:
	backbone/views.py
Makes BackboneView fields take precedence over model fields