Updated overrides for Joomla 2.5.18
Updated overrides for Joomla 3.2.2
Merge branch 'develop' of https://github.com/joomlashack/wright into develop
Merge branch 'develop' of github.com:JoseMarkos/wright into develop