This code fixes the bug of issue 96 and includes the enhancement of task 94.
fix of previous commit...
Merge branch 'task_94_n_96' of https://github.com/grglaz/openeclass into grglaz-task_94_n_96

Conflicts:
	modules/work/index.php
Merge branch 'grglaz-task_94_n_96'