Language commits
Merge branch 'master' of github.com:yireo/JoomlaPluginsBook

Conflicts:
	chapter04/plg_content_ch04test01/administrator/language/en-GB/en-GB.plg_content_ch04test01.ini