Merge origin/master

Conflicts:
	protected/models/Agendaextra.php
Merge origin/master