route wrong
Merge branch 'master' of https://github.com/mikevanemmerik/LaravelWebshop

Conflicts:
	app/controllers/LoginController.php
Merge branch 'master' of https://github.com/mikevanemmerik/LaravelWebshop