Add an optional attribute to Resource.Meta to allow documentation for custom filtering.
merge upstream changes
Obvious typo
Don't try to render the view please
Added list view possibility to mapping.py
Added description field to extra_options
Merge commit '6d0baa4eeca5d6a14a8fcdb79c242644bce9a053'

Conflicts:
	tastypie_swagger/templates/tastypie_swagger/index.html
	tastypie_swagger/views.py
Merge branch 'extra_actions' of github.com:joshkehn/django-tastypie-swagger into joshkehn-extra_actions
Merge branch 'master' of github.com:davidmiller/django-tastypie-swagger into davidmiller-master

Conflicts:
	tastypie_swagger/views.py
Bumped version and added .pypirc config to gitignore
fix README formatting
Merge pull request #47 from minism/patch-1

fix README formatting
Fields are optional in `extra_actions`

Documentation updated to reflect. Fixes bug #51.
Merge branch '51_make_fields_optional'
Introduce end-of-line normalization
feat(Markdown): add support for markdown in doc string.