Merge branch '320-edit-appointment-type' into 'master'

Resolve "edit appointment type"

Closes #320

See merge request NCER-PD/scheduling-system!226

smash/web/models/appointment_type.py

@@ -31,7 +31,7 @@ class AppointmentType(models.Model):
                                       default=APPOINTMENT_TYPE_DEFAULT_COLOR
                                       )
     calendar_font_color = models.CharField(max_length=2000,
-                                           verbose_name='Calendar color',
+                                           verbose_name='Calendar font color',
                                            default=APPOINTMENT_TYPE_DEFAULT_FONT_COLOR
                                            )
     rest_time = models.IntegerField(