Merge branch 'hotfix/edit-task-milestone-error'
Add story points or time estimate to task lozenge
UI tweak: underline clickable part of task lozenge on hover
Add new task types and improve display code for add/edit form
Add classes for new task types (TODO make them linked to the DB somehow)
Merge branch 'hotfix/ui-tweaks' into develop