OES-144
Merge branch 'master' of github.com:huridocs/OpenEvSys

Conflicts:
	mod/person/personModule.class.php