Merge branch 'master' of https://github.com/odelrio/emeuvece

Conflicts:
	core/classes/class.core.php