Merge pull request #58 from chamilo/1.9.x

1.9.x
Update $extras array keys doesn't contain 'extra_' then substr($key , 6) is useless -refs #7072
Update UpdateContentHeight() to use JQuery  and fix div sizes
Minor: update variables names from french to english language to make it more legible -refs #7077 #6033
Minor - adding deprecated.
Merge pull request #59 from chamilo/1.9.x

1.9.x
Changing button text on first survey page -refs #7103
Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19
Add support for 1.9.6.1 in upgrade script
Adding lang translation see #7109
Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19
Minor - format code.
Revert useless commit
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x
Fix little icon issue
Update languages
Update languages - Move MyFiles from userInfo to trad4all
add icon myFiles user_portal
Added validations to course introductions import script - refs BT#8057
Fix issue not showing join conference button to students - refs #7122
Fix issue not showing join conference button to students - refs #7122