Design login
Merge branch 'master' of https://github.com/sistema-aj/SISTEMA-intranet

Conflicts:
	views/connexion.php