Merge branch 'develop' into admin_link

django/website/taxonomies/tests/factories.py

django/website/taxonomies/tests/taxonomy_tests.py

django/website/taxonomies/tests/term_tests.py

django/website/templates/base.html

django/website/templates/base_side.html

django/website/transport/__init__.py

django/website/transport/items.py

django/website/transport/taxonomies.py

django/website/transport/tests/item_add_term_tests.py

django/website/transport/tests/item_create_tests.py

django/website/transport/tests/taxonomy_list_tests.py

readme.markdown