Removed auto conversion of links to a-tags
Merge branch 'development'