New setting: secretaria W.S
Merge branch 'master' of https://github.com/IOC/moodle-local-secretaria

Conflicts:
	settings.php