Commit update source code
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/deploy.properties
	components/com_englishconcept/admin/englishconcept.php
	components/com_englishconcept/admin/sql/install.mysql.utf8.sql
	components/com_englishconcept/admin/views/englishconcepts/tmpl/default.php
	components/com_englishconcept/admin/views/englishconcepts/view.html.php