a
Merge remote-tracking branch 'remotes/origin/master2'

Conflicts:
	shop-exiaStore/src/controller/login.php
	shop-exiaStore/src/controller/signup.php
	shop-exiaStore/src/models/mapping/SPDO.php
	shop-exiaStore/src/models/mapping/userGestion.php