Rename translation options attributes: ``fields`` to ``local_fields`` and ``inherited_fields`` to just ``fields``, to match Django naming.
Store original field name and translation fields in one dict.
Let manager and update command see all fields rather than just local.
Merge branch 'feature/complex-inheritance' into develop

Conflicts:
	modeltranslation/manager.py
	modeltranslation/translator.py