Login code
Merge branch 'devel' of github:Ybalrid/N2I_Tardis into devel

Conflicts:
	www/login.php