ajuste
Merge branch 'master' of https://github.com/yuido/TvidiServer

Conflicts:
	src/Yuido/Fractalia/GestorSalasBundle/Admin/ReservaAdmin.php