Merge pull request #62 from chamilo/1.9.x

1.9.x
remove 'overwrite' comment
Solve bug #7208
!
Revert "!"

This reverts commit 65e2efff75436130780772b3ea1531af58d29a50.
Solves Bug#7210

Solve the bug when displaying icons in block courses
Ref Bug#7210
Solve bug #7210
Merge remote-tracking branch 'angel/7210' into 1.9.x

Conflicts:
	main/inc/lib/userportal.lib.php
Solves Bug#7179

Solves problem editing password when username=email
Fixing hide buttons see BT#8417
Minor update docs + format code
Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19
Update changelog in prevision of 1.9.8.3
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x
Merge remote-tracking branch 'upstream/1.9.x' into 1.9.x
check token to avoid CSRF - refs BT#7215
Fixing PHP warnings see BT#8440
Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19
Add Wodo Text editor sample  -refs BT#8274
Minor - format code.