new changes
Merge branch 'master' of https://github.com/giannisdag/openeclass

Conflicts:
	modules/work/index.php
	modules/work/rank_report.php