Merge branch 'master' of edugit.org:AlekSIS/Official/AlekSIS-App-Chronos

aleksis/apps/chronos/admin.py

aleksis/apps/chronos/forms.py

aleksis/apps/chronos/managers.py

aleksis/apps/chronos/menus.py

...sis/apps/chronos/migrations/0005_remove_school_related.py

aleksis/apps/chronos/migrations/0006_extended_data.py

...pps/chronos/migrations/0007_advanced_models_from_untis.py

aleksis/apps/chronos/migrations/0008_break_period.py

aleksis/apps/chronos/migrations/0009_extended_data.py

aleksis/apps/chronos/migrations/0010_absence_reason_name.py

...s/chronos/migrations/0011_absence_for_groups_and_rooms.py

...ps/chronos/migrations/0012_event_remove_absence_reason.py

aleksis/apps/chronos/migrations/0013_event_title_optional.py

aleksis/apps/chronos/migrations/0014_extra_lesson.py

...ps/chronos/migrations/0015_rename_abbrev_to_short_name.py

...sis/apps/chronos/migrations/0016_add_globalpermissions.py

aleksis/apps/chronos/model_extensions.py

aleksis/apps/chronos/models.py

aleksis/apps/chronos/preferences.py

aleksis/apps/chronos/rules.py