Revert "Merge branch 'master' of /home/daas/PycharmProjects/is2/pmm_is2 with conflicts."

This reverts commit 3c551b1fa21559a1e674390cd2d71dcea42093e2.

Conflicts:
	adm/views.py
Arreglado un pequenho bug