Adding hotpotatoe type in assessments -refs #5994
Fixing indentation bugs
Fixing indentation bugs
Fixed and extended feature patch for logging of users enabling/disabling - refs #6213
Minor - removing var_dump
Updated translations - refs #6173
Work: fixed a few local date issues and column names in assignments - refs BT#6418
Updated translations - refs #6173
Better fix for quotes escaping issue in exercises - refs #5751
Merge pull request #94 from ycastillo/yoselyn.5994

Adding hotpotatoe type in assessments -refs #5994
Minor - format code
Fixing version check via ajax see #6216
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into julio6666
Merge branch 'chamilo19'

Conflicts:
	main/admin/index.php
	main/exercice/hotpotatoes.lib.php
	main/exercice/question_list_admin.inc.php
	main/gradebook/lib/be/exerciselink.class.php
	main/inc/ajax/admin.ajax.php
	main/inc/ajax/user_manager.ajax.php
	main/inc/lib/main_api.lib.php
	main/inc/lib/usermanager.lib.php
	main/lang/english/admin.inc.php
	main/lang/english/exercice.inc.php
	main/lang/english/trad4all.inc.php
	main/lang/polish/admin.inc.php
	main/lang/polish/document.inc.php
	main/lang/spanish/admin.inc.php
	main/lang/spanish/exercice.inc.php
	main/lang/spanish/trad4all.inc.php
	main/template/default/admin/settings_index.tpl