controlar que el padre este bloqueado
finalizar fase
pagina 500 y 404
Merge branch 'master' into rodri

Conflicts:
	item/views.py
	proyecto/views.py
Merge branch 'rodri'
Merge branch 'master' of https://github.com/yank07/WPM