Mock up of report - refs BT#8232
Solve merge conflict
Avance de reportes
Merge branch '8232' of github.com:DeEvo/chamilo-lms-utp into 8232
Solve Bug
add function to get tags
Return the origin file

(cherry picked from commit eb6e1b92e62ba62124cf26f29654197c4f7c1b66)

Conflicts:
	main/work/work.lib.php
Add function to get exercises score by tag -refs BT#8232
possible bug
Merge branch '1.9.x' into 8232

Conflicts:
	main/inc/ajax/model.ajax.php
	main/inc/lib/sessionmanager.lib.php
	main/inc/lib/tracking.lib.php
	main/mySpace/index.php
	main/mySpace/myspace.lib.php
Merge branch '8232' into 8232-d

Conflicts:
	main/inc/lib/sessionmanager.lib.php
Merge branch '1.9.x' into 8232

Conflicts:
	main/inc/ajax/model.ajax.php
	main/inc/lib/sessionmanager.lib.php
	main/inc/lib/tracking.lib.php
	main/mySpace/index.php
	main/mySpace/myspace.lib.php
Merge branch '8232-d' into 8232
Merge branch '8232' of github.com:DeEvo/chamilo-lms-utp into 8232

Conflicts:
	main/inc/ajax/model.ajax.php
	main/inc/lib/course.lib.php
	main/inc/lib/sessionmanager.lib.php
	main/inc/lib/tracking.lib.php
	main/mySpace/myspace.lib.php
Add category filter to report - refs BT#8337
Minor code conventions - refs BT#8232
Solve course.lib.php conflict - refs BT#8232
Merge pull request #38 from DeEvo/8232

8232