Merge remote-tracking branch 'remotes/origin/master' into 9-use-permissions-rules

aleksis/apps/hjelp/forms.py

aleksis/apps/hjelp/migrations/0005_rename_bug_category.py

aleksis/apps/hjelp/models.py

aleksis/apps/hjelp/templates/hjelp/issue_report.html

...is/apps/hjelp/templates/hjelp/issue_report_submitted.html

aleksis/apps/hjelp/templates/hjelp/mail/feedback.html

aleksis/apps/hjelp/templates/hjelp/mail/feedback.txt

aleksis/apps/hjelp/templates/hjelp/mail/question.html

aleksis/apps/hjelp/templates/hjelp/mail/question.txt

aleksis/apps/hjelp/templates/hjelp/mail/rebus.html

aleksis/apps/hjelp/templates/hjelp/mail/rebus.txt

aleksis/apps/hjelp/views.py