login local
Merge branch 'newgen' of https://github.com/UPCnet/epi into newgen

Conflicts:
	epi/login.py