Merge pull request #123 from joomla/push-to-github

Push to GitHub
Merge branch 'framework' into g11n
Fix CS