Display of article images in Newsflash module
Styles support for Joomla 3.1+ (using previous subversions)
Changed bootstrap styles in Admin for embedded Bootstrap styles when in Joomla 3+
Support for template styles with dashes in the name
Removal of second "span" class when span is added to the module class suffix
Added support for template.css files (in less folder) to insert direct css - used to avoid problems with recess and calc()
Allow search button to change according to the selected style
Merge branch 'develop' into overrides-3.1.1-2.5.11

Conflicts:
	code/wright/html/joomla_2.5/.DS_Store