Merge "Moved Text Controller & Markup Processor to sub-folders" into devel/master