Added `choices_name` parameter to StatusField
Updated `CONTRIBUTING.rst`
Updated `CHANGES.rst`
Merge pull request #94 from tucarga/contributing

Updated `CONTRIBUTING.rst`
Merge pull request #93 from tucarga/choices-name

Added choices_name parameter to StatusField
move TimeStampedModel docs to models.rst
Merge pull request #98 from BME-IK/move-timestamp-docs

Move TimeStampedModel docs to models.rst
fix get_query_set deprecationwarnings
backwards comptatible get_queryset, for Django < 1.6
Check for StatusModel field name conflicts correctly.
Update runtests.py for compatibility with Django 1.7.
Update tox.ini.
Merge branch 'master' into query-set-deprecated

* master:
  Update tox.ini.
  Update runtests.py for compatibility with Django 1.7.
  Check for StatusModel field name conflicts correctly.
Remove special support for pickling PassThroughManager; apparently unnecessary in all supported Django/Python versions.
Bump version to 2.0.
Update supported Django/Python versions.
Bump version for dev.
Attempt to carry over extras(select) values from parent
added geo support for PassThroughManager
edited class names