changed alignment of forms to match
updated model/task_spec
Merge remote-tracking branch 'origin/master'