Merge branch 'Task_UserControllerTests' into development
Added nl2br support for list item descriptions.
Fixed issues with autoconverting urls/nl2br.
Merge branch 'Task_ListItemDescriptionNL2BR' into aws_production
Move nl2br out of model and into template.
Merge branch 'Task_ListItemDescriptionNL2BR' into aws_production