Merge pull request #70 from jatitoam/develop

com_content overrides for Joomla 3.0 and small fixes for Joomla 2.5