Merge branch 'master' of github.com:chamilo/chamilo-lms into 7099

Conflicts:
	composer.json
	main/inc/lib/formvalidator/FormValidator.class.php
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_namespaces.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
Merge branch '7099' of github.com:FraGoTe/chamilo-lms into 7099

Conflicts:
	composer.json