Merge https://github.com/chamilo/chamilo-lms/commit/3e05713a96b1d5afab43e4989afcdf5cd5a70802

Conflicts:
	main/inc/ajax/online.ajax.php
Merge pull request #11 from danbarretodev/7213

Fix bug -refs BT#7213