dfadsfadsfds
Merge branch 'master' into newbrancheee

Conflicts:
	pms/pms/modelo/entidad.pyc
	pms/pms/modelo/initdb.pyc
	pms/pms/modelo/usuarioControlador.pyc