Fix issue where making links clickable conflicted with formatting codes
More constistant CSS class name
Merge branch 'development'
Server: Capturing DNS exceptions
Merge branch 'master' into development