Update Controller Module
Merge remote-tracking branch 'origin/master'

Conflicts:
	contoller/Email.php
	contoller/Validation.php
	views/basket.php
	views/login.php