Merge branch 'master' of edugit.org:Teckids/BiscuIT/BiscuIT-ng

biscuit/core/forms.py

biscuit/core/locale/ar/LC_MESSAGES/django.po

biscuit/core/locale/de_DE/LC_MESSAGES/django.po

biscuit/core/locale/fr/LC_MESSAGES/django.po

biscuit/core/locale/nb_NO/LC_MESSAGES/django.po

biscuit/core/locale/tr_TR/LC_MESSAGES/django.po

biscuit/core/menus.py

biscuit/core/migrations/0002_school_term.py

biscuit/core/migrations/0003_school_logo.py

biscuit/core/models.py

biscuit/core/settings.py

biscuit/core/templates/core/edit_school.html

biscuit/core/templates/core/edit_schoolterm.html

biscuit/core/templates/core/school_management.html

biscuit/core/urls.py

biscuit/core/views.py