Merge remote-tracking branch 'github/Zalimben5-2' into Agu2

Conflicts:
	administrarFases/views.py
	administrarItems/models.py
	administrarItems/views.py
	administrarProyectos/views.py
	conf/staticZarPm.conf
	is2/urls.py