fix all additional text areas to only allow two rows of text
Merge origin/development into development