Jquery update
Merge remote-tracking branch 'origin/master'

Conflicts:
	editcode/tryit.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	editcode/tryit.php