Update source code ec...
Merge remote-tracking branch 'origin/master'

Conflicts:
	components/com_englishconcept/admin/views/usage/tmpl/edit_general.php