Merge remote-tracking branch 'origin/frontend' into frontend

...pps/maka/frontend/components/effort_types/EffortTypes.vue

aleksis/apps/maka/frontend/components/efforts/Efforts.vue

.../frontend/components/grade_management/GradeManagement.vue

...frontend/components/shared_secret/SharedSecretWrapper.vue

...ka/frontend/components/shared_secret/sharedSecret.graphql

aleksis/apps/maka/frontend/index.js

aleksis/apps/maka/frontend/messages/en.json

aleksis/apps/maka/models/__init__.py

aleksis/apps/maka/preferences.py

aleksis/apps/maka/rules.py

aleksis/apps/maka/schema/__init__.py

aleksis/apps/maka/schema/effort.py

aleksis/apps/maka/schema/grade.py

aleksis/apps/maka/schema/grade_set.py

aleksis/apps/maka/schema/shared_secret.py

aleksis/apps/maka/util/predicates.py